From 45e8dd5f2dacc8fe8a099a17750aaa685a152b62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com> Date: Fri, 17 Dec 2021 14:09:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=93=E5=AE=B6=E6=B3=A8=E5=86=8C=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/AppConfig.js | 2 +- src/military/expert/register/index.jsx | 70 +++++++++++++++++++------- 2 files changed, 54 insertions(+), 18 deletions(-) diff --git a/src/AppConfig.js b/src/AppConfig.js index becad667..9f851f8b 100644 --- a/src/AppConfig.js +++ b/src/AppConfig.js @@ -25,7 +25,7 @@ if (isDev) { } debugType = window.location.search.indexOf('debug=t') !== -1 ? 'teacher' : window.location.search.indexOf('debug=s') !== -1 ? 'student' : - window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || 'a' + window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || 'admin' } function clearAllCookie() { cookie.remove('_educoder_session', { path: '/' }); diff --git a/src/military/expert/register/index.jsx b/src/military/expert/register/index.jsx index 415c0b0f..d5b8f5e6 100644 --- a/src/military/expert/register/index.jsx +++ b/src/military/expert/register/index.jsx @@ -4,11 +4,16 @@ import { Link } from "react-router-dom"; import { unitType, natureOfWork, highestEducation, positionLevel, professionalType, reviewArea } from '../static'; import './index.scss'; import '../index.scss'; +import axios from 'axios'; export default Form.create()(({ match, history, showNotification, form }) => { const { getFieldDecorator, validateFields, setFieldsValue } = form; + //专家注册取消确认框 const [cancelConfirmValue, setCancelConfirmValue] = useState(false); + //专家注册提交确认框 const [submitConfirmValue, setSubmitConfirmValue] = useState(false); + //专家注册填写的信息 + const [expertRegisterValues, setExpertRegisterValues] = useState(undefined); // form表单公共处理函数 const helper = useCallback( @@ -25,10 +30,41 @@ export default Form.create()(({ match, history, showNotification, form }) => { form.validateFields((err, values) =>{ if(!err){ console.log('111',values); + setExpertRegisterValues(values); + setSubmitConfirmValue(true); } }) } + //注册 + function expertRegister(){ + console.log('222',expertRegisterValues); + expertRegisterValues && axios.post(`/experts/register`,{ + academicAchievements: expertRegisterValues.academicAchievements || "", + bankAccount: expertRegisterValues.bankAccount || "", + bankName: expertRegisterValues.bankName || "", + expertEmail: expertRegisterValues.expertEmail || "", + expertName: expertRegisterValues.expertName || "", + expertType: expertRegisterValues.expertType || "", + graduatedFrom: expertRegisterValues.graduatedFrom || "", + highestDegree: expertRegisterValues.highestDegree || "", + honors: expertRegisterValues.honors || "", + idNumber: expertRegisterValues.idNumber || "", + major: expertRegisterValues.major || "", + phone: expertRegisterValues.phone || "", + professionalTitle: expertRegisterValues.professionalTitle || "", + resume: expertRegisterValues.resume || "", + reviewAreaOne: expertRegisterValues.reviewAreaOne || "", + reviewAreaTwo: expertRegisterValues.reviewAreaTwo || "", + reviewAreaThree: expertRegisterValues.reviewAreaThree || "", + titleCertificate: expertRegisterValues.titleCertificate || "", + titleRank: expertRegisterValues.titleRank || "", + workNature: expertRegisterValues.workNature || "", + workplace: expertRegisterValues.workplace || "", + workplaceType: expertRegisterValues.workplaceType || "" + }) + } + return (
@@ -47,7 +83,7 @@ export default Form.create()(({ match, history, showNotification, form }) => { { helper('姓名', 'expertName', - [{ required: true, message: "姓名不能为空" }], + [{ required: false, message: "姓名不能为空" }], @@ -58,7 +94,7 @@ export default Form.create()(({ match, history, showNotification, form }) => { { helper('最高学历', 'highestDegree', - [{ required: true, message: '请选择最高学历' }], + [{ required: false, message: '请选择最高学历' }], @@ -107,7 +143,7 @@ export default Form.create()(({ match, history, showNotification, form }) => { { helper('单位类别', 'workplaceType', - [{ required: true, message: "请选择单位类别" }], + [{ required: false, message: "请选择单位类别" }], {natureOfWork.map(item=>{ return @@ -134,15 +170,15 @@ export default Form.create()(({ match, history, showNotification, form }) => { {helper('专业职称', 'professionalTitle', - [{ required: true, message: "专业职称不能为空" }], + [{ required: false, message: "专业职称不能为空" }], )} {helper('职称职级', - 'professionalYears', - [{ required: true, message: "请选择职称职级" }], + 'titleRank', + [{ required: false, message: "请选择职称职级" }], {professionalType.map(item=>{ return @@ -166,7 +202,7 @@ export default Form.create()(({ match, history, showNotification, form }) => { {helper('评审领域1', 'reviewAreaOne', - [{ required: true, message: "请选择评审领域" }], + [{ required: false, message: "请选择评审领域" }], {reviewArea.map(item=>{ return @@ -253,7 +289,7 @@ export default Form.create()(({ match, history, showNotification, form }) => { {helper('职称证明', - 'resume', [], + 'titleCertificate', [], )} @@ -262,14 +298,14 @@ export default Form.create()(({ match, history, showNotification, form }) => { {helper('学术成果', - 'resume', [], + 'academicAchievements', [], )} {helper('荣誉称号', - 'resume', [], + 'honors', [], )} @@ -278,11 +314,11 @@ export default Form.create()(({ match, history, showNotification, form }) => {
- + expertRegisterSubmit(e)} + onOk={expertRegister} onCancel={() => setSubmitConfirmValue(false)} wrapClassName="expert_modal submit" closeIcon={}