新需求增加

This commit is contained in:
BianLzhaoMin 2025-06-20 18:19:07 +08:00
parent 0c5066d196
commit 6feeade308
3 changed files with 69 additions and 29 deletions

View File

@ -151,25 +151,50 @@
show-word-limit show-word-limit
placeholder="请输入资格证书" placeholder="请输入资格证书"
v-model="item.diploma" v-model="item.diploma"
v-if="formType === 2"
> >
</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">
<!-- 增加的按钮 --> <!-- 增加的按钮 -->
<i <el-button
slot="suffix"
@click="onAddDiploma()" @click="onAddDiploma()"
v-if="index === 0 && formType !== 2" v-if="index === 0 && formType !== 2"
class="el-input__icon el-icon-plus" type="primary"
style="color: #409eff; cursor: pointer" icon="el-icon-plus"
/> />
<!-- 删除的按钮 --> <!-- 删除的按钮 -->
<i <el-button
slot="suffix"
@click="onDeleteDiploma(index)" @click="onDeleteDiploma(index)"
v-if="index !== 0 && formType !== 2" v-if="index !== 0 && formType !== 2"
class="el-input__icon el-icon-delete" type="danger"
style="color: #f56c6c; cursor: pointer" icon="el-icon-delete"
/> />
</el-input> </el-col>
</el-row>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
@ -292,6 +317,7 @@ export default {
fileViewUrl: process.env.VUE_APP_BASE_API + '/files', fileViewUrl: process.env.VUE_APP_BASE_API + '/files',
deleteFileList: [], deleteFileList: [],
uploadOuterVisible: false, uploadOuterVisible: false,
diplomaList: [{ name: '注册建造师' }, { name: '项目经理B证' }], //
addAndEditForm: { addAndEditForm: {
userName: '', // userName: '', //
idCard: '', // idCard: '', //
@ -650,6 +676,9 @@ export default {
handler(newVal) { handler(newVal) {
if (newVal && Object.keys(newVal).length > 0) { if (newVal && Object.keys(newVal).length > 0) {
Object.assign(this.addAndEditForm, { ...newVal }) Object.assign(this.addAndEditForm, { ...newVal })
// if (!['', 'B'].includes(newVal.diploma)) {
// this.diplomaList.push({ name: newVal.diploma })
// }
this.addAndEditForm.idCardFront = this.addAndEditForm.tbFileSourceVoList this.addAndEditForm.idCardFront = this.addAndEditForm.tbFileSourceVoList
.filter((item) => item.fileType == 1) .filter((item) => item.fileType == 1)
.map((e) => { .map((e) => {

View File

@ -116,6 +116,17 @@
/> />
</el-form-item> </el-form-item>
</el-col> </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> </el-row>
</div> </div>
@ -343,13 +354,13 @@ export default {
trigger: 'blur', trigger: 'blur',
}, },
], ],
diplomaNum: [ // diplomaNum: [
{ // {
required: true, // required: true,
message: '请输入证书编码', // message: '',
trigger: 'blur', // trigger: 'blur',
}, // },
], // ],
isNormal: [ isNormal: [
{ {
required: true, required: true,
@ -398,7 +409,7 @@ export default {
workType, // workType, //
major, // major, //
// diploma, // // diploma, //
// diplomaNum, // diplomaNum, //
// level, // // level, //
// isNormal, // // isNormal, //
idCardFront, // idCardFront, //
@ -537,7 +548,7 @@ export default {
title, title,
major, major,
// diploma, // diploma,
// diplomaNum, diplomaNum,
// level, // level,
// isNormal, // isNormal,
tbFileSourceVoList, tbFileSourceVoList,

View File

@ -168,7 +168,7 @@ export default {
{ label: '职称', prop: 'title' }, { label: '职称', prop: 'title' },
// { label: '', prop: 'diploma' }, // { label: '', prop: 'diploma' },
// { label: '', prop: 'level' }, // { label: '', prop: 'level' },
// { label: '', prop: 'diplomaNum' }, { label: '证书号', prop: 'diplomaNum' },
{ label: '专业', prop: 'major' }, { label: '专业', prop: 'major' },
// { label: '', prop: 'isNormal', isSlot: true }, // { label: '', prop: 'isNormal', isSlot: true },
{ label: '职工类型', prop: 'workType', isSlot: true }, { label: '职工类型', prop: 'workType', isSlot: true },
@ -219,7 +219,7 @@ export default {
workType, // workType, //
major, // major, //
// diploma, // // diploma, //
// diplomaNum, // diplomaNum, //
// level, // // level, //
// isNormal, // // isNormal, //
id, id,
@ -234,7 +234,7 @@ export default {
workType, workType,
major, major,
// diploma, // diploma,
// diplomaNum, diplomaNum,
// level, // level,
// isNormal, // isNormal,
id, id,