From 1da948c1c8808077f10e3aa32fafd30939ee5c12 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期二, 03 十二月 2024 16:37:39 +0800
Subject: [PATCH] 新增
---
src/views/safetyReview/expertManage/fillForm/index.vue | 87 ++++++++++++++++++++++++++++++++-----------
1 files changed, 64 insertions(+), 23 deletions(-)
diff --git a/src/views/safetyReview/expertManage/fillForm/index.vue b/src/views/safetyReview/expertManage/fillForm/index.vue
index 410ff0f..d133eb8 100644
--- a/src/views/safetyReview/expertManage/fillForm/index.vue
+++ b/src/views/safetyReview/expertManage/fillForm/index.vue
@@ -82,7 +82,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" :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" 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>
@@ -188,7 +200,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>-->
@@ -200,7 +212,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>-->
@@ -224,11 +236,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" :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" :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>
@@ -272,8 +284,8 @@
</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" :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-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>
<div class="el-upload__tip">上传jpg/png图片尺寸小于5M,最多可上传5张</div>
@@ -284,8 +296,8 @@
</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" :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-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>
<div class="el-upload__tip">上传jpg/png图片尺寸小于5M,最多可上传5张</div>
@@ -324,13 +336,38 @@
const { proxy } = getCurrentInstance();
const imgDialog = ref(false)
const ruleFormRef = ref()
-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('请输入手机号'))
@@ -380,6 +417,7 @@
supportDirectionSafety: [],
supportDirectionPrevention: [],
supportDirectionEmergency: [],
+ evidence: '',
resumeKey: '',
paperSituationKey: '',
rewardKey: '',
@@ -418,6 +456,7 @@
Authorization: 'Bearer ' + getToken()
},
fileList: [],
+ evidenceList: [],
resumeList: [],
inventionList: [],
rewardList: [],
@@ -433,8 +472,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' }]
@@ -534,7 +576,7 @@
} else {
ElMessage({
type: 'warning',
- message: res.message
+ message: res.msg
})
}
})
@@ -545,14 +587,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 = data.supportDirectionSafety.join(',')
- data.supportDirectionPrevention = data.supportDirectionPrevention.join(',')
- data.supportDirectionEmergency = data.supportDirectionEmergency.join(',')
+ 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(',')
@@ -587,6 +626,7 @@
supportDirectionSafety: [],
supportDirectionPrevention: [],
supportDirectionEmergency: [],
+ evidence: '',
resumeKey: '',
paperSituationKey: '',
rewardKey: '',
@@ -597,6 +637,7 @@
source: 1
}
state.fileList = []
+ state.evidenceList = []
state.resumeList = []
state.inventionList = []
state.rewardList = []
--
Gitblit v1.9.2