From 39be275791af44a3db0f00dd48e8aafbd27ed39d Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: Tue, 10 Dec 2024 08:50:58 +0800
Subject: [PATCH] 修改bug
---
src/views/safetyReview/expertManage/applyRecords/components/expertForm.vue | 152 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 119 insertions(+), 33 deletions(-)
diff --git a/src/views/safetyReview/expertManage/applyRecords/components/expertForm.vue b/src/views/safetyReview/expertManage/applyRecords/components/expertForm.vue
index 59cf27e..646a7db 100644
--- a/src/views/safetyReview/expertManage/applyRecords/components/expertForm.vue
+++ b/src/views/safetyReview/expertManage/applyRecords/components/expertForm.vue
@@ -6,8 +6,6 @@
width="80%"
:before-close="handleClose"
>
- <div class="main-title">专家信息录入</div>
- <!-- <el-divider>专家信息录入</el-divider>-->
<div class="main_form">
<el-form :model="state.form" :rules="state.rules" ref="ruleFormRef" label-width="200px">
<el-row>
@@ -89,7 +87,19 @@
</el-row>
<el-row>
<el-col :span="20">
- <el-form-item label="证件照" prop="electronicPhoto">
+ <el-form-item label="职称或资质证明材料" prop="evidence">
+ <el-upload accept="image/*" multiple :action="state.uploadUrl" :headers="state.header" method="post" :disabled="state.disable" :on-success="(res, uploadFile)=>handleAvatarSuccess(res, uploadFile,'著作')" :on-exceed="showTip" :on-preview="handlePictureCardPreview" :limit='8' v-model:file-list="state.evidenceList" list-type="picture-card" :before-upload="picSize" :on-remove="(file, uploadFiles)=>handleRemove(file, uploadFiles,'证明')" :before-remove="beforeRemove">
+ <el-icon><Plus /></el-icon>
+ <template #tip>
+ <div class="el-upload__tip">上传jpg/png图片尺寸小于5M,最多可上传5张</div>
+ </template>
+ </el-upload>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="20">
+ <el-form-item label="2寸免冠证件照">
<el-upload accept="image/*" :action="state.uploadUrl" :headers="state.header" :disabled="state.disable" method="post" :on-success="(res, uploadFile)=>handleAvatarSuccess(res, uploadFile,'证件照')" :on-exceed="showTip" :on-preview="handlePictureCardPreview" :limit='1' v-model:file-list="state.fileList" list-type="picture-card" :before-upload="picSize" :on-remove="(file, uploadFiles)=>handleRemove(file, uploadFiles,'证件照')" :before-remove="beforeRemove">
<el-icon><Plus /></el-icon>
<template #tip>
@@ -113,6 +123,13 @@
<el-radio :label="0">在岗</el-radio>
<el-radio :label="1">退休</el-radio>
</el-radio-group>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="20">
+ <el-form-item label="最高学历" prop="degree">
+ <el-input v-model="state.form.degree" :readonly="state.disable"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -174,13 +191,6 @@
</el-row>
<el-row>
<el-col :span="20">
- <el-form-item label="最高学历" prop="degree">
- <el-input v-model="state.form.degree" :readonly="state.disable"></el-input>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="20">
<el-form-item label="所学专业">
<el-input v-model="state.form.speciality" :readonly="state.disable"></el-input>
</el-form-item>
@@ -195,7 +205,7 @@
</el-row>
<el-row>
<el-col :span="20">
- <el-form-item label="支撑方向_安全生产" prop="supportDirectionSafety">
+ <el-form-item label="支撑方向_安全生产" prop="supportDirectionEmergency">
<!-- <el-radio-group v-model="form.supportDirectionSafety">-->
<!-- <el-radio v-for="item in directionList" :label="item.value" :key="item.value">{{ item.label }}</el-radio>-->
<!-- </el-radio-group>-->
@@ -207,7 +217,7 @@
</el-row>
<el-row>
<el-col :span="20">
- <el-form-item label="支撑方向_防灾减灾救灾" prop="supportDirectionPrevention">
+ <el-form-item label="支撑方向_防灾减灾救灾" prop="supportDirectionEmergency">
<!-- <el-radio-group v-model="form.supportDirectionPrevention">-->
<!-- <el-radio v-for="item in directionList" :label="item.value" :key="item.value">{{ item.label }}</el-radio>-->
<!-- </el-radio-group>-->
@@ -231,11 +241,11 @@
</el-row>
<el-row>
<el-col :span="20">
- <el-form-item label="工作简历">
- <el-upload accept="image/*" multiple :action="state.uploadUrl" :headers="state.header" method="post" :disabled="state.disable" :on-success="(res, uploadFile)=>handleAvatarSuccess(res, uploadFile,'简历')" :on-exceed="showTip" :on-preview="handlePictureCardPreview" :limit='8' v-model:file-list="state.resumeList" list-type="picture-card" :before-upload="picSize" :on-remove="(file, uploadFiles)=>handleRemove(file, uploadFiles,'简历')" :before-remove="beforeRemove">
- <el-icon><Plus /></el-icon>
+ <el-form-item label="工作简历" prop="resumeKey">
+ <el-upload accept=".pdf" multiple :action="state.uploadUrl" :headers="state.header" method="post" :disabled="state.disable" :on-success="(res, uploadFile)=>handleAvatarSuccess(res, uploadFile,'简历')" :on-exceed="showTip" :limit='8' v-model:file-list="state.resumeList" :before-upload="picSize" :on-remove="(file, uploadFiles)=>handleRemove(file, uploadFiles,'简历')" :before-remove="beforeRemove">
+ <el-button type="primary">点击上传</el-button>
<template #tip>
- <div class="el-upload__tip">上传jpg/png图片尺寸小于5M,最多可上传5张</div>
+ <div class="el-upload__tip">上传pdf格式文件尺寸小于5M,最多可上传5份</div>
</template>
</el-upload>
</el-form-item>
@@ -279,7 +289,7 @@
</el-row>
<el-row>
<el-col :span="20">
- <el-form-item label="专家本人意见">
+ <el-form-item label="专家本人意见" prop="recommendUnitOpinionKey">
<el-upload accept="image/*" multiple :action="state.uploadUrl" :headers="state.header" method="post" :disabled="state.disable" :on-success="(res, uploadFile)=>handleAvatarSuccess(res, uploadFile,'本人')" :on-exceed="showTip" :on-preview="handlePictureCardPreview" :limit='8' v-model:file-list="state.proAdviceList" list-type="picture-card" :before-upload="picSize" :on-remove="(file, uploadFiles)=>handleRemove(file, uploadFiles,'本人')" :before-remove="beforeRemove">
<el-icon><Plus /></el-icon>
<template #tip>
@@ -291,7 +301,7 @@
</el-row>
<el-row>
<el-col :span="20">
- <el-form-item label="推荐单位意见">
+ <el-form-item label="推荐单位意见" prop="recommendUnitOpinionKey">
<el-upload accept="image/*" multiple :action="state.uploadUrl" :headers="state.header" method="post" :disabled="state.disable" :on-success="(res, uploadFile)=>handleAvatarSuccess(res, uploadFile,'单位')" :on-exceed="showTip" :on-preview="handlePictureCardPreview" :limit='8' v-model:file-list="state.adviceList" list-type="picture-card" :before-upload="picSize" :on-remove="(file, uploadFiles)=>handleRemove(file, uploadFiles,'单位')" :before-remove="beforeRemove">
<el-icon><Plus /></el-icon>
<template #tip>
@@ -308,10 +318,37 @@
</el-form-item>
</el-col>
</el-row>
+ <el-row v-if="state.title == '查看'">
+ <el-col :span="20">
+ <el-form-item label="专家聘用期限" prop="employTime">
+ <el-date-picker
+ :disabled="state.disable"
+ v-model="state.assessForm.employTime"
+ type="daterange"
+ range-separator="至"
+ start-placeholder="开始日期"
+ end-placeholder="结束日期"
+ value-format="YYYY-MM-DD"
+ />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row v-if="state.title == '查看'">
+ <el-col :span="20">
+ <el-form-item label="专家评定等级" prop="ratingLevel">
+ <el-radio-group v-model="state.assessForm.ratingLevel" :disabled="state.disable">
+ <el-radio label="1">一级</el-radio>
+ <el-radio label="2">二级</el-radio>
+ <el-radio label="3">三级</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-col>
+ </el-row>
</el-form>
<el-dialog v-model="imgDialog">
<img style="width: 100%" w-full :src="state.dialogImageUrl" alt="">
</el-dialog>
+
<el-dialog
v-model="state.assessDialog"
title="评定详情"
@@ -356,7 +393,6 @@
</span>
</template>
</el-dialog>
-
</div>
</template>
<script setup>
@@ -374,13 +410,38 @@
const ruleFormRef = ref()
const assessFormRef = ref()
const { proxy } = getCurrentInstance()
-var validatePass = (rule, value, callback) => {
- if (state.fileList.length == 0) {
- callback(new Error('请上传证件照'));
+let validatePass = (rule, value, callback) => {
+ if (state.resumeList.length == 0) {
+ callback(new Error('请上传工作简历'));
} else {
callback();
}
}
+
+let validateEvidence = (rule, value, callback) => {
+ if (state.evidenceList.length == 0) {
+ callback(new Error('请上传证明材料'));
+ } else {
+ callback();
+ }
+}
+
+let validateOneOfTwo = (rule, value, callback) => {
+ if (state.proAdviceList.length == 0 && state.adviceList.length == 0) {
+ callback(new Error('专家本人意见和推荐单位意见须至少上传一项'));
+ } else {
+ callback();
+ }
+}
+
+let validateOneOfThree = (rule, value, callback) => {
+ if (state.form.supportDirectionSafety.length==0&&state.form.supportDirectionSafety.length==0&&state.form.supportDirectionSafety.length==0) {
+ callback(new Error('请至少从三种支撑方向中勾选一种'));
+ } else {
+ callback();
+ }
+}
+
let validatePhone = (rule, value, callback)=>{
if(value === ''){
callback(new Error('请输入手机号'))
@@ -432,6 +493,7 @@
supportDirectionSafety: [],
supportDirectionPrevention: [],
supportDirectionEmergency: [],
+ evidence: '',
resumeKey: '',
paperSituationKey: '',
rewardKey: '',
@@ -476,6 +538,7 @@
Authorization: 'Bearer ' + getToken()
},
fileList: [],
+ evidenceList: [],
resumeList: [],
inventionList: [],
rewardList: [],
@@ -491,8 +554,11 @@
birthday: [{ required: true, message: '请选择出生日期', trigger: 'blur' }],
phone:[{ required: true, validator: validatePhone, trigger: 'blur' }],
title: [{ required: true, message: '请填写职称', trigger: 'blur' }],
- electronicPhoto: [{ required: true,validator: validatePass, trigger: 'blur' }],
+ evidence: [{ required: true,validator: validateEvidence, trigger: 'blur' }],
+ resumeKey: [{ required: true,validator: validatePass, trigger: 'blur' }],
+ recommendUnitOpinionKey: [{ required: true,validator: validateOneOfTwo, trigger: 'blur' }],
idCard: [{ required: true, validator: verifyId, trigger: 'blur' }],
+ supportDirectionEmergency: [{ required: true,validator: validateOneOfThree, trigger: 'blur' }],
dutyStatus: [{ required: true, message: '请选择在岗情况', trigger: 'blur' }],
companyName: [{ required: true, message: '请填写单位全称', trigger: 'blur' }],
degree: [{ required: true, message: '请填写最高学历', trigger: 'blur' }]
@@ -536,12 +602,22 @@
}else{
state.form.supportDirectionEmergency = []
}
- state.fileList.push({
- name: state.form.electronicPhoto,
- url: state.form.electronicPhoto,
- })
+ if(state.form.electronicPhoto!== ''){
+ state.fileList.push({
+ name: state.form.electronicPhoto,
+ url: state.form.electronicPhoto,
+ })
+ }
if(state.form.resumeKey !== ''){
state.resumeList = state.form.resumeKey.split(',').map(i=>{
+ return {
+ name: i,
+ url: i,
+ }
+ })
+ }
+ if(state.form.evidence !== ''){
+ state.evidenceList = state.form.evidence.split(',').map(i=>{
return {
name: i,
url: i,
@@ -589,16 +665,25 @@
})
}
}
- console.log(state.form,'form')
dialogVisible.value = true
}else{
ElMessage.warning('数据获取失败：'+res.msg)
}
})
if(type == 'edit'){
- state.disable = false
+ if(value.state == 2){
+ state.disable = true
+ dialogVisible.value = false
+ state.assessDialog = true
+ }else{
+ state.disable = false
+ }
}else{
state.disable = true
+ }
+ if(value.state == 2){
+ state.assessForm.ratingLevel = value.ratingLevel
+ state.assessForm.employTime = [value.employmentDateStart,value.employmentDateEnd]
}
}else{
state.disable = false
@@ -762,14 +847,11 @@
if (!formEl) return
await formEl.validate(async (valid, fields) => {
if (valid) {
- if(state.form.supportDirectionSafety.length==0&&state.form.supportDirectionSafety.length==0&&state.form.supportDirectionSafety.length==0){
- ElMessage.warning('请至少选择一种支撑方向')
- return
- }
let data = JSON.parse(JSON.stringify(state.form))
data.supportDirectionSafety = Array.isArray(data.supportDirectionSafety)?data.supportDirectionSafety.join(','):''
data.supportDirectionPrevention = Array.isArray(data.supportDirectionPrevention)?data.supportDirectionPrevention.join(','):''
data.supportDirectionEmergency = Array.isArray(data.supportDirectionEmergency)?data.supportDirectionEmergency.join(','):''
+ data.evidence = state.evidenceList.map(i=>i.name).join(',')
data.resumeKey = state.resumeList.map(i=>i.name).join(',')
data.paperSituationKey = state.inventionList.map(i=>i.name).join(',')
data.rewardKey = state.rewardList.map(i=>i.name).join(',')
@@ -782,6 +864,7 @@
if(res.code == 200){
ElMessage.success(res.msg)
state.fileList = []
+ state.evidenceList = []
state.resumeList = []
state.inventionList = []
state.rewardList = []
@@ -799,6 +882,7 @@
if(res.code == 200){
ElMessage.success(res.msg)
state.fileList = []
+ state.evidenceList = []
state.resumeList = []
state.inventionList = []
state.rewardList = []
@@ -867,6 +951,7 @@
supportDirectionSafety: [],
supportDirectionPrevention: [],
supportDirectionEmergency: [],
+ evidence: '',
resumeKey: '',
paperSituationKey: '',
rewardKey: '',
@@ -877,6 +962,7 @@
source: 2
}
state.fileList = []
+ state.evidenceList = []
state.resumeList = []
state.inventionList = []
state.rewardList = []
--
Gitblit v1.9.2