新需求增加
This commit is contained in:
parent
0c5066d196
commit
6feeade308
|
|
@ -151,25 +151,50 @@
|
|||
show-word-limit
|
||||
placeholder="请输入资格证书"
|
||||
v-model="item.diploma"
|
||||
v-if="formType === 2"
|
||||
>
|
||||
<!-- 增加的按钮 -->
|
||||
<i
|
||||
slot="suffix"
|
||||
@click="onAddDiploma()"
|
||||
v-if="index === 0 && formType !== 2"
|
||||
class="el-input__icon el-icon-plus"
|
||||
style="color: #409eff; cursor: pointer"
|
||||
/>
|
||||
|
||||
<!-- 删除的按钮 -->
|
||||
<i
|
||||
slot="suffix"
|
||||
@click="onDeleteDiploma(index)"
|
||||
v-if="index !== 0 && formType !== 2"
|
||||
class="el-input__icon el-icon-delete"
|
||||
style="color: #f56c6c; cursor: pointer"
|
||||
/>
|
||||
</el-input>
|
||||
|
||||
<el-row v-else :gutter="24">
|
||||
<el-col :span="20">
|
||||
<el-select
|
||||
clearable
|
||||
filterable
|
||||
allow-create
|
||||
style="width: 100%"
|
||||
v-model="item.diploma"
|
||||
placeholder="请选择资格证书"
|
||||
>
|
||||
<!-- <el-option
|
||||
v-for="item in diplomaList"
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
:value="item.name"
|
||||
/> -->
|
||||
|
||||
<el-option label="注册建造师" value="注册建造师" />
|
||||
<el-option label="项目经理B证" value="项目经理B证" />
|
||||
</el-select>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="4">
|
||||
<!-- 增加的按钮 -->
|
||||
<el-button
|
||||
@click="onAddDiploma()"
|
||||
v-if="index === 0 && formType !== 2"
|
||||
type="primary"
|
||||
icon="el-icon-plus"
|
||||
/>
|
||||
|
||||
<!-- 删除的按钮 -->
|
||||
<el-button
|
||||
@click="onDeleteDiploma(index)"
|
||||
v-if="index !== 0 && formType !== 2"
|
||||
type="danger"
|
||||
icon="el-icon-delete"
|
||||
/>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
|
|
@ -292,6 +317,7 @@ export default {
|
|||
fileViewUrl: process.env.VUE_APP_BASE_API + '/files',
|
||||
deleteFileList: [],
|
||||
uploadOuterVisible: false,
|
||||
diplomaList: [{ name: '注册建造师' }, { name: '项目经理B证' }], // 资格证书列表
|
||||
addAndEditForm: {
|
||||
userName: '', // 姓名
|
||||
idCard: '', // 身份证号码
|
||||
|
|
@ -650,6 +676,9 @@ export default {
|
|||
handler(newVal) {
|
||||
if (newVal && Object.keys(newVal).length > 0) {
|
||||
Object.assign(this.addAndEditForm, { ...newVal })
|
||||
// if (!['注册建造师', '项目经理B证'].includes(newVal.diploma)) {
|
||||
// this.diplomaList.push({ name: newVal.diploma })
|
||||
// }
|
||||
this.addAndEditForm.idCardFront = this.addAndEditForm.tbFileSourceVoList
|
||||
.filter((item) => item.fileType == 1)
|
||||
.map((e) => {
|
||||
|
|
|
|||
|
|
@ -116,6 +116,17 @@
|
|||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="证书号" prop="diplomaNum">
|
||||
<el-input
|
||||
clearable
|
||||
maxlength="20"
|
||||
show-word-limit
|
||||
placeholder="请输入证书号"
|
||||
v-model="addAndEditForm.diplomaNum"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
|
||||
|
|
@ -343,13 +354,13 @@ export default {
|
|||
trigger: 'blur',
|
||||
},
|
||||
],
|
||||
diplomaNum: [
|
||||
{
|
||||
required: true,
|
||||
message: '请输入证书编码',
|
||||
trigger: 'blur',
|
||||
},
|
||||
],
|
||||
// diplomaNum: [
|
||||
// {
|
||||
// required: true,
|
||||
// message: '请输入证书编码',
|
||||
// trigger: 'blur',
|
||||
// },
|
||||
// ],
|
||||
isNormal: [
|
||||
{
|
||||
required: true,
|
||||
|
|
@ -398,7 +409,7 @@ export default {
|
|||
workType, // 职工类型
|
||||
major, // 专业
|
||||
// diploma, // 资格证书
|
||||
// diplomaNum, // 证书编码
|
||||
diplomaNum, // 证书编码
|
||||
// level, // 级别
|
||||
// isNormal, // 养老保险
|
||||
idCardFront, // 身份证正面
|
||||
|
|
@ -537,7 +548,7 @@ export default {
|
|||
title,
|
||||
major,
|
||||
// diploma,
|
||||
// diplomaNum,
|
||||
diplomaNum,
|
||||
// level,
|
||||
// isNormal,
|
||||
tbFileSourceVoList,
|
||||
|
|
|
|||
|
|
@ -168,7 +168,7 @@ export default {
|
|||
{ label: '职称', prop: 'title' },
|
||||
// { label: '资格证书', prop: 'diploma' },
|
||||
// { label: '级别', prop: 'level' },
|
||||
// { label: '证书编号', prop: 'diplomaNum' },
|
||||
{ label: '证书号', prop: 'diplomaNum' },
|
||||
{ label: '专业', prop: 'major' },
|
||||
// { label: '养老保险', prop: 'isNormal', isSlot: true },
|
||||
{ label: '职工类型', prop: 'workType', isSlot: true },
|
||||
|
|
@ -219,7 +219,7 @@ export default {
|
|||
workType, // 职工类型
|
||||
major, // 专业
|
||||
// diploma, // 资格证书
|
||||
// diplomaNum, // 证书编码
|
||||
diplomaNum, // 证书编码
|
||||
// level, // 级别
|
||||
// isNormal, // 养老保险
|
||||
id,
|
||||
|
|
@ -234,7 +234,7 @@ export default {
|
|||
workType,
|
||||
major,
|
||||
// diploma,
|
||||
// diplomaNum,
|
||||
diplomaNum,
|
||||
// level,
|
||||
// isNormal,
|
||||
id,
|
||||
|
|
|
|||
Loading…
Reference in New Issue