feat: 注册用户信息修改兼容性问题
This commit is contained in:
cgd_mac
parent
3034a1a3b0
commit
9244890936
|
|
@ -20,25 +20,26 @@
|
|||
<a-input v-decorator="['userId']" />
|
||||
</a-form-item>
|
||||
|
||||
<a-form-item
|
||||
label="用户名"
|
||||
:labelCol="labelCol"
|
||||
:wrapperCol="wrapperCol"
|
||||
has-feedback
|
||||
>
|
||||
<a-input placeholder="请输入用户名" :disabled="registerDisabled" v-decorator="['userName', {rules: [{required: true, message: '请输入用户名!'}]}]" />
|
||||
<a-form-item label="用户名" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
|
||||
<a-input
|
||||
placeholder="请输入用户名"
|
||||
:disabled="registerDisabled"
|
||||
v-decorator="[
|
||||
'userName',
|
||||
{ rules: [{ required: true, message: '请输入用户名!' }] },
|
||||
]"
|
||||
/>
|
||||
</a-form-item>
|
||||
</a-form>
|
||||
</a-col>
|
||||
<a-col :md="12" :sm="24" >
|
||||
<a-col :md="12" :sm="24">
|
||||
<a-form :form="form">
|
||||
<a-form-item
|
||||
label="姓名"
|
||||
:labelCol="labelCol"
|
||||
:wrapperCol="wrapperCol"
|
||||
has-feedback
|
||||
>
|
||||
<a-input placeholder="请输入姓名" :disabled="registerDisabled" v-decorator="['name', {rules: [{required: true, message: '请输入姓名！'}]}]" />
|
||||
<a-form-item label="姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
|
||||
<a-input
|
||||
placeholder="请输入姓名"
|
||||
:disabled="registerDisabled"
|
||||
v-decorator="['name', { rules: [{ required: true, message: '请输入姓名！' }] }]"
|
||||
/>
|
||||
</a-form-item>
|
||||
</a-form>
|
||||
</a-col>
|
||||
|
|
@ -46,24 +47,21 @@
|
|||
<a-row :gutter="24">
|
||||
<a-col :md="12" :sm="24">
|
||||
<a-form :form="form">
|
||||
<a-form-item
|
||||
label="身份证"
|
||||
:labelCol="labelCol"
|
||||
:wrapperCol="wrapperCol"
|
||||
has-feedback
|
||||
>
|
||||
<a-input placeholder="请输入身份证" v-decorator="['idCardNo', {rules: [{required: true, message: '请输入身份证！'}]}]" @blur="idCardNoBlur"/>
|
||||
<a-form-item label="身份证" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
|
||||
<a-input
|
||||
placeholder="请输入身份证"
|
||||
v-decorator="[
|
||||
'idCardNo',
|
||||
{ rules: [{ required: true, message: '请输入身份证！' }] },
|
||||
]"
|
||||
@blur="idCardNoBlur"
|
||||
/>
|
||||
</a-form-item>
|
||||
</a-form>
|
||||
</a-col>
|
||||
<a-col :md="12" :sm="24">
|
||||
<a-form :form="form">
|
||||
<a-form-item
|
||||
label="年龄"
|
||||
:labelCol="labelCol"
|
||||
:wrapperCol="wrapperCol"
|
||||
has-feedback
|
||||
>
|
||||
<a-form-item label="年龄" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
|
||||
<a-input readOnly v-decorator="['age']" />
|
||||
</a-form-item>
|
||||
</a-form>
|
||||
|
|
@ -72,12 +70,11 @@
|
|||
<a-row :gutter="24">
|
||||
<a-col :md="12" :sm="24">
|
||||
<a-form :form="form">
|
||||
<a-form-item
|
||||
label="性别"
|
||||
:labelCol="labelCol"
|
||||
:wrapperCol="wrapperCol"
|
||||
<a-form-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
||||
<a-radio-group
|
||||
readOnly
|
||||
v-decorator="['sex', { rules: [{ required: true, message: '请选择性别！' }] }]"
|
||||
>
|
||||
<a-radio-group readOnly v-decorator="['sex',{rules: [{ required: true, message: '请选择性别！' }]}]" >
|
||||
<a-radio :value="1">男</a-radio>
|
||||
<a-radio :value="2">女</a-radio>
|
||||
</a-radio-group>
|
||||
|
|
@ -86,13 +83,12 @@
|
|||
</a-col>
|
||||
<a-col :md="12" :sm="24">
|
||||
<a-form :form="form">
|
||||
<a-form-item
|
||||
label="手机号"
|
||||
:labelCol="labelCol"
|
||||
:wrapperCol="wrapperCol"
|
||||
has-feedback
|
||||
>
|
||||
<a-input placeholder="请输入手机号" v-decorator="['phone',{rules: [{ required: true, message: '请输入手机号！' }]}]" />
|
||||
<a-form-item label="手机号" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
|
||||
<a-input
|
||||
:disabled="type == 2"
|
||||
placeholder="请输入手机号"
|
||||
v-decorator="['phone', { rules: [{ required: true, message: '请输入手机号！' }] }]"
|
||||
/>
|
||||
</a-form-item>
|
||||
</a-form>
|
||||
</a-col>
|
||||
|
|
@ -102,12 +98,18 @@
|
|||
<a-form :form="form">
|
||||
<a-form-item
|
||||
label="岗位"
|
||||
:labelCol="{span: 3}"
|
||||
:wrapperCol="{span: 20}"
|
||||
:labelCol="{ span: 3 }"
|
||||
:wrapperCol="{ span: 20 }"
|
||||
has-feedback
|
||||
>
|
||||
<a-select style="width: 100%" placeholder="请选择岗位" v-decorator="['jobs',{rules: [{ required: true, message: '请选择岗位！' }]}]" >
|
||||
<a-select-option v-for="(item,index) in jobsData" :key="index" :value="item.value" >{{ item.name }}</a-select-option>
|
||||
<a-select
|
||||
style="width: 100%"
|
||||
placeholder="请选择岗位"
|
||||
v-decorator="['jobs', { rules: [{ required: true, message: '请选择岗位！' }] }]"
|
||||
>
|
||||
<a-select-option v-for="(item, index) in jobsData" :key="index" :value="item.value">
|
||||
{{ item.name }}
|
||||
</a-select-option>
|
||||
</a-select>
|
||||
</a-form-item>
|
||||
</a-form>
|
||||
|
|
@ -116,28 +118,38 @@
|
|||
<a-row :gutter="24">
|
||||
<a-col :md="12" :sm="24">
|
||||
<a-form :form="form">
|
||||
<a-form-item
|
||||
label="工种"
|
||||
:labelCol="labelCol"
|
||||
:wrapperCol="wrapperCol"
|
||||
has-feedback
|
||||
<a-form-item label="工种" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
|
||||
<a-select
|
||||
style="width: 100%"
|
||||
placeholder="请选择工种"
|
||||
v-decorator="['workType', { rules: [{ required: true, message: '请选择工种！' }] }]"
|
||||
>
|
||||
<a-select style="width: 100%" placeholder="请选择工种" v-decorator="['workType',{rules: [{ required: true, message: '请选择工种！' }]}]" >
|
||||
<a-select-option v-for="(item,index) in workTypeData" :key="index" :value="item.value" >{{ item.name }}</a-select-option>
|
||||
<a-select-option
|
||||
v-for="(item, index) in workTypeData"
|
||||
:key="index"
|
||||
:value="item.value"
|
||||
>
|
||||
{{ item.name }}
|
||||
</a-select-option>
|
||||
</a-select>
|
||||
</a-form-item>
|
||||
</a-form>
|
||||
</a-col>
|
||||
<a-col :md="12" :sm="24">
|
||||
<a-form :form="form">
|
||||
<a-form-item
|
||||
label="学历"
|
||||
:labelCol="labelCol"
|
||||
:wrapperCol="wrapperCol"
|
||||
has-feedback
|
||||
<a-form-item label="学历" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
|
||||
<a-select
|
||||
style="width: 100%"
|
||||
placeholder="请选择学历"
|
||||
v-decorator="['degreeId', { rules: [{ required: true, message: '请选择学历！' }] }]"
|
||||
>
|
||||
<a-select style="width: 100%" placeholder="请选择学历" v-decorator="['degreeId',{rules: [{ required: true, message: '请选择学历！' }]}]" >
|
||||
<a-select-option v-for="(item,index) in degreeData" :key="index" :value="item.value" >{{ item.name }}</a-select-option>
|
||||
<a-select-option
|
||||
v-for="(item, index) in degreeData"
|
||||
:key="index"
|
||||
:value="item.value"
|
||||
>
|
||||
{{ item.name }}
|
||||
</a-select-option>
|
||||
</a-select>
|
||||
</a-form-item>
|
||||
</a-form>
|
||||
|
|
@ -146,13 +158,16 @@
|
|||
<a-row :gutter="24">
|
||||
<a-col :md="24" :sm="24">
|
||||
<a-form :form="form">
|
||||
<a-form-item
|
||||
label="人员类型"
|
||||
:labelCol="{span: 3}"
|
||||
:wrapperCol="{span: 20}"
|
||||
<a-form-item label="人员类型" :labelCol="{ span: 3 }" :wrapperCol="{ span: 20 }">
|
||||
<a-checkbox-group
|
||||
v-decorator="['type', { rules: [{ required: true, message: '请选择人员类型！' }] }]"
|
||||
>
|
||||
<a-checkbox
|
||||
name="type"
|
||||
v-for="(item, index) in typeData"
|
||||
:key="index"
|
||||
:value="item.value"
|
||||
>
|
||||
<a-checkbox-group v-decorator="['type',{rules: [{ required: true, message: '请选择人员类型！' }]}]">
|
||||
<a-checkbox name="type" v-for="(item,index) in typeData" :key="index" :value="item.value" >
|
||||
{{ item.name }}
|
||||
</a-checkbox>
|
||||
</a-checkbox-group>
|
||||
|
|
@ -169,7 +184,17 @@
|
|||
:wrapperCol="wrapperCol"
|
||||
has-feedback
|
||||
>
|
||||
<a-input readOnly @click="openOrgTree" v-decorator="['orgName',{rules: [{ required: true, message: '请选择机构！' }]}]" />
|
||||
<a-input
|
||||
v-if="type == 1"
|
||||
readOnly
|
||||
@click="openOrgTree"
|
||||
v-decorator="['orgName', { rules: [{ required: true, message: '请选择机构！' }] }]"
|
||||
/>
|
||||
<a-input
|
||||
v-else
|
||||
readOnly
|
||||
v-decorator="['orgName', { rules: [{ required: true, message: '请选择机构！' }] }]"
|
||||
/>
|
||||
</a-form-item>
|
||||
<a-form-item style="display: none;">
|
||||
<a-input v-decorator="['orgId']" />
|
||||
|
|
@ -177,7 +202,7 @@
|
|||
</a-form>
|
||||
</a-col>
|
||||
</a-row>
|
||||
<a-row :gutter="24">
|
||||
<a-row :gutter="24" v-if="type == 1">
|
||||
<a-col :md="12" :sm="24">
|
||||
<a-form :form="form">
|
||||
<a-form-item
|
||||
|
|
@ -196,21 +221,15 @@
|
|||
<a-row :gutter="24">
|
||||
<a-col :md="12" :sm="24">
|
||||
<a-form :form="form">
|
||||
<a-form-item
|
||||
label="身份证正面"
|
||||
:labelCol="labelCol"
|
||||
:wrapperCol="wrapperCol">
|
||||
<db-upload v-model="fileList" max="1" type='img'></db-upload>
|
||||
<a-form-item label="身份证正面" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
||||
<db-upload v-model="fileList" max="1" type="img"></db-upload>
|
||||
</a-form-item>
|
||||
</a-form>
|
||||
</a-col>
|
||||
<a-col :md="12" :sm="24">
|
||||
<a-form :form="form">
|
||||
<a-form-item
|
||||
label="身份证反面"
|
||||
:labelCol="labelCol"
|
||||
:wrapperCol="wrapperCol">
|
||||
<db-upload v-model="fileList2" max="1" type='img'></db-upload>
|
||||
<a-form-item label="身份证反面" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
||||
<db-upload v-model="fileList2" max="1" type="img"></db-upload>
|
||||
</a-form-item>
|
||||
</a-form>
|
||||
</a-col>
|
||||
|
|
@ -220,33 +239,34 @@
|
|||
<a-row :gutter="24">
|
||||
<a-col :md="12" :sm="24">
|
||||
<a-form :form="form">
|
||||
<a-form-item
|
||||
label="图像"
|
||||
:labelCol="labelCol"
|
||||
:wrapperCol="wrapperCol">
|
||||
<db-upload v-model="fileList3" max="1" type='img' fileSize="500"></db-upload>
|
||||
<a-form-item label="图像" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
||||
<db-upload v-model="fileList3" max="1" type="img" fileSize="500"></db-upload>
|
||||
</a-form-item>
|
||||
</a-form>
|
||||
</a-col>
|
||||
</a-row>
|
||||
|
||||
</a-spin>
|
||||
|
||||
<org-tree @selectOrg="selectOrg($event)" ref="orgModal"/>
|
||||
|
||||
<org-tree @selectOrg="selectOrg($event)" ref="orgModal" />
|
||||
</a-modal>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { personAddOrUpdate, personGet } from '@/api/person/person'
|
||||
import { dictionaryDropDown } from '@/api/sys/dictionaryItem'
|
||||
import OrgTree from '../org/OrgTree'
|
||||
import DbUpload from '@/components/DbUpload/DbUpload.vue'
|
||||
export default {
|
||||
import { personAddOrUpdate, personGet } from '@/api/person/person'
|
||||
import { dictionaryDropDown } from '@/api/sys/dictionaryItem'
|
||||
import OrgTree from '../org/OrgTree'
|
||||
import DbUpload from '@/components/DbUpload/DbUpload.vue'
|
||||
export default {
|
||||
components: {
|
||||
OrgTree,
|
||||
DbUpload
|
||||
},
|
||||
props: {
|
||||
type: {
|
||||
type: [String, Number],
|
||||
default: 1 // 1: 默认原来的类型 2: 注册弹出的修改框
|
||||
}
|
||||
},
|
||||
data () {
|
||||
return {
|
||||
labelCol: {
|
||||
|
|
@ -286,8 +306,7 @@
|
|||
this.registerDisabled = true
|
||||
setTimeout(() => {
|
||||
// 基本信息加入表单
|
||||
this.form.setFieldsValue(
|
||||
{
|
||||
this.form.setFieldsValue({
|
||||
name: record.name,
|
||||
userName: record.userName,
|
||||
phone: record.phone,
|
||||
|
|
@ -295,8 +314,7 @@
|
|||
orgName: record.orgName,
|
||||
id: record.personId, // 审核注册信息 需要把personId带入
|
||||
userId: record.userId
|
||||
}
|
||||
)
|
||||
})
|
||||
}, 100)
|
||||
|
||||
this.confirmLoading = false
|
||||
|
|
@ -311,16 +329,19 @@
|
|||
this.registerDisabled = true
|
||||
|
||||
// 基本信息加入表单
|
||||
personGet({ id: record.id }).then((res) => {
|
||||
personGet({ id: record.id }).then(res => {
|
||||
if (res.code === 200) {
|
||||
const data = res.data
|
||||
// 默认选中的多选框
|
||||
const type = data.type && data.type.split(',') || []
|
||||
const typeIntArr = []// 保存转换后的整型字符串
|
||||
const type = (data.type && data.type.split(',')) || []
|
||||
const typeIntArr = [] // 保存转换后的整型字符串
|
||||
type.forEach(item => {
|
||||
typeIntArr.push(+item)
|
||||
})
|
||||
this.form.getFieldDecorator('type', { valuePropName: 'checked', initialValue: typeIntArr })
|
||||
this.form.getFieldDecorator('type', {
|
||||
valuePropName: 'checked',
|
||||
initialValue: typeIntArr
|
||||
})
|
||||
|
||||
if (data.idPhotoFace) {
|
||||
this.fileList = JSON.parse(data.idPhotoFace)
|
||||
|
|
@ -335,8 +356,7 @@
|
|||
url: data.avatar
|
||||
})
|
||||
}
|
||||
this.form.setFieldsValue(
|
||||
{
|
||||
this.form.setFieldsValue({
|
||||
id: data.id,
|
||||
userId: data.userId,
|
||||
name: data.name,
|
||||
|
|
@ -351,8 +371,7 @@
|
|||
orgId: data.orgId,
|
||||
orgName: data.orgName,
|
||||
planClassHour: data.planClassHour
|
||||
}
|
||||
)
|
||||
})
|
||||
// 动态赋值年龄和性别
|
||||
this.analyzeIdCardNo(data.idCardNo)
|
||||
} else {
|
||||
|
|
@ -367,25 +386,27 @@
|
|||
dictionaryDropDown () {
|
||||
this.formLoading = true
|
||||
// 岗位
|
||||
dictionaryDropDown({ dictionaryCode: '0002' }).then((res) => {
|
||||
dictionaryDropDown({ dictionaryCode: '0002' }).then(res => {
|
||||
this.jobsData = res.data
|
||||
})
|
||||
// 工种
|
||||
dictionaryDropDown({ dictionaryCode: '0003' }).then((res) => {
|
||||
dictionaryDropDown({ dictionaryCode: '0003' }).then(res => {
|
||||
this.workTypeData = res.data
|
||||
})
|
||||
// 学历
|
||||
dictionaryDropDown({ dictionaryCode: '0004' }).then((res) => {
|
||||
dictionaryDropDown({ dictionaryCode: '0004' }).then(res => {
|
||||
this.degreeData = res.data
|
||||
})
|
||||
// 人员类型
|
||||
dictionaryDropDown({ dictionaryCode: '0005' }).then((res) => {
|
||||
dictionaryDropDown({ dictionaryCode: '0005' }).then(res => {
|
||||
this.typeData = res.data
|
||||
this.formLoading = false
|
||||
})
|
||||
},
|
||||
handleSubmit () {
|
||||
const { form: { validateFields } } = this
|
||||
const {
|
||||
form: { validateFields }
|
||||
} = this
|
||||
this.confirmLoading = true
|
||||
|
||||
const _this = this
|
||||
|
|
@ -397,7 +418,7 @@
|
|||
if (this.fileList3.length > 0) values.avatar = this.fileList3[0].url
|
||||
|
||||
// 如果是注册审核的，弹出提示框
|
||||
if(_this.isRegister === 1) {
|
||||
if (_this.isRegister === 1) {
|
||||
this.$confirm({
|
||||
title: '提示',
|
||||
content: '确认通过审核吗?',
|
||||
|
|
@ -410,14 +431,14 @@
|
|||
} else {
|
||||
_this.addOrUpdate(values)
|
||||
}
|
||||
|
||||
} else {
|
||||
this.confirmLoading = false
|
||||
}
|
||||
})
|
||||
},
|
||||
addOrUpdate (values) {
|
||||
personAddOrUpdate(values).then((res) => {
|
||||
personAddOrUpdate(values).then(
|
||||
res => {
|
||||
this.confirmLoading = false
|
||||
if (res.code === 200) {
|
||||
this.$message.success('操作成功')
|
||||
|
|
@ -427,9 +448,11 @@
|
|||
} else {
|
||||
this.$message.error('操作失败：' + res.msg)
|
||||
}
|
||||
}, (err) => {
|
||||
},
|
||||
err => {
|
||||
this.$message.error(err)
|
||||
})
|
||||
}
|
||||
)
|
||||
},
|
||||
idCardNoBlur (event) {
|
||||
const idCardNo = event.target.value
|
||||
|
|
@ -478,5 +501,5 @@
|
|||
this.visible = false
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
<a-button size="large" style="margin-left: 8px" @click="goHomeHandle">返回登录页</a-button>
|
||||
</template>
|
||||
</a-result>
|
||||
<PersonForm ref="personForm"></PersonForm>
|
||||
<PersonForm ref="personForm" type="2"></PersonForm>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue