tongChong
/
forgeplus-react
forked from Gitlink/forgeplus-react
1
0
Fork 1
Code Issues Pull Requests 1 Releases Wiki Activity

修改提交信息

This commit is contained in:
何童崇 2021-12-20 13:32:16 +08:00
parent 7ab22cfa8f
commit d10175165d
2 changed files with 65 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/military/expert/expertList/index.jsx
View File

@ -8,6 +8,7 @@ import { professionalType, reviewArea } from "../static";
import './index.scss';
import '../index.scss';
const { Search } = Input;
const Option=Select.Option;
function RegisterList({ showNotification }) {
const [reload, setReload] = useState();
@ -111,18 +112,18 @@ function RegisterList({ showNotification }) {
title: '个人简介',
dataIndex: 'resume',
},
// {
// title: '职称证明',
// dataIndex: 'titleCertificate',
// },
// {
// title: '学术成果',
// dataIndex: 'academicAchievements',
// },
// {
// title: '荣誉称号',
// dataIndex: 'honors',
// },
// {
// title: '职称证明',
// dataIndex: 'titleCertificate',
// },
// {
// title: '学术成果',
// dataIndex: 'academicAchievements',
// },
// {
// title: '荣誉称号',
// dataIndex: 'honors',
// },
];
}, []);
@ -170,7 +171,7 @@ function RegisterList({ showNotification }) {
},
});
}
// 上传附件后得到的文件数组
function uploadExpert(fileList, files) {
setUploadExpertList(fileList);
@ -194,10 +195,10 @@ function RegisterList({ showNotification }) {
style={{ width: "150px" }}
placeholder="所有类别"
dropdownClassName="expert_register"
onChange={(value) => { setExpertType(value)}}>
<Option value="">所有类别</Option>
onChange={(value) => { setExpertType(value) }}>
<Option key={'all'} value="">所有类别</Option>
{professionalType.map(item => {
return <Option value={item.value}>{item.label}</Option>
return <Option key={item.value} value={item.value}>{item.label}</Option>
})}
</Select>
<span>评审领域：</span>
@ -207,18 +208,18 @@ function RegisterList({ showNotification }) {
dropdownClassName="expert_register"
onChange={(value) => { setSearchReviewArea(value) }}>
<Option value="">所有领域</Option>
{reviewArea.map(item=>{
{reviewArea.map(item => {
return <Option value={item.value}>{item.label}</Option>
})}
</Select>
</div>
<div>
<Upload
{/* <Upload
load={uploadExpert}
size={50}
showNotification={showNotification}
fileList={uploadExpertList}
></Upload>
></Upload> */}
<button className="but41_fill">导入</button>
<button className="but41_fill">导出</button>
</div>

64
src/military/expert/register/index.jsx
View File

@ -2,11 +2,10 @@ import React, { useEffect, useState, useCallback } from 'react';
import { Button, Icon, Form, Modal, Input, Select } from 'antd';
import Upload from '../components/Upload';
import { unitType, natureOfWork, highestEducation, positionLevel, professionalType, reviewArea } from '../static';
import { expertRegister,getCurrentExpert } from '../api';
import { expertRegister, getCurrentExpert } from '../api';
import './index.scss';
import '../index.scss';
import axios from 'axios';
const Option = Select.Option;
export default Form.create()(({ match, history, showNotification, form, current_user }) => {
@ -27,14 +26,39 @@ export default Form.create()(({ match, history, showNotification, form, current_
const [honorList, setHonorListList] = useState([]);
const [honorIds, setHonorIds] = useState();
// 获取列表
useEffect(() => {
let params={};
getCurrentExpert(params).then(res => {
console.log(res);
});
}, []);
// 获取列表
useEffect(() => {
let params = {};
getCurrentExpert(params).then(res => {
if (res && res.data && res.data.length) {
let lastRegister = res.data.pop();
let params={
bankAccount: lastRegister.bankAccount || "",
bankName: lastRegister.bankName || "",
expertEmail: lastRegister.expertEmail || "",
expertName: lastRegister.expertName || "",
expertType: lastRegister.expertType || "",
graduatedFrom: lastRegister.graduatedFrom || "",
highestDegree: lastRegister.highestDegree || "",
idNumber: lastRegister.idNumber || "",
major: lastRegister.major || "",
phone: lastRegister.phone || "",
professionalTitle: lastRegister.professionalTitle || "",
reviewAreaOne: lastRegister.reviewAreaOne || "",
reviewAreaTwo: lastRegister.reviewAreaTwo || "",
reviewAreaThree: lastRegister.reviewAreaThree || "",
titleRank: lastRegister.titleRank || "",
workNature: lastRegister.workNature || "",
workplace: lastRegister.workplace || "",
workplaceType: lastRegister.workplaceType || "",
}
setFieldsValue(params);
setExpertRegisterValues(params);
}
});
}, []);
// 上传附件后得到的文件数组
function uploadResume(fileList, files) {
@ -154,6 +178,7 @@ export default Form.create()(({ match, history, showNotification, form, current_
<p>专家资料</p>
<div>
<table>
<tbody>
<tr>
<td>
{
@ -173,7 +198,7 @@ export default Form.create()(({ match, history, showNotification, form, current_
[{ required: true, message: '请选择最高学历' }],
<Select placeholder="请选择" dropdownClassName="expert_register">
{highestEducation.map(item => {
return <Option value={item.value}>{item.label}</Option>
return <Option key={item.value} value={item.value}>{item.label}</Option>
})}
</Select>
)
@ -222,7 +247,7 @@ export default Form.create()(({ match, history, showNotification, form, current_
[{ required: true, message: "请选择单位类别" }],
<Select placeholder="请选择" dropdownClassName="expert_register">
{unitType.map(item => {
return <Option value={item.value}>{item.label}</Option>
return <Option key={item.value} value={item.value}>{item.label}</Option>
})}
</Select>
)
@ -235,7 +260,7 @@ export default Form.create()(({ match, history, showNotification, form, current_
[{ required: true, message: "请选择工作性质" }],
<Select placeholder="请选择" dropdownClassName="expert_register">
{natureOfWork.map(item => {
return <Option value={item.value}>{item.label}</Option>
return <Option key={item.value} value={item.value}>{item.label}</Option>
})}
</Select>
)
@ -257,7 +282,7 @@ export default Form.create()(({ match, history, showNotification, form, current_
[{ required: true, message: "请选择职称职级" }],
<Select placeholder="请选择" dropdownClassName="expert_register">
{positionLevel.map(item => {
return <Option value={item.value}>{item.label}</Option>
return <Option key={item.value} value={item.value}>{item.label}</Option>
})}
</Select>
)}
@ -270,7 +295,7 @@ export default Form.create()(({ match, history, showNotification, form, current_
[{ required: true, message: "请选择专业类别" }],
<Select placeholder="请选择" dropdownClassName="expert_register">
{professionalType.map(item => {
return <Option value={item.value}>{item.label}</Option>
return <Option key={item.value} value={item.value}>{item.label}</Option>
})}
</Select>
)}
@ -281,7 +306,7 @@ export default Form.create()(({ match, history, showNotification, form, current_
[{ required: true, message: "请选择评审领域" }],
<Select placeholder="请选择" dropdownClassName="expert_register">
{reviewArea.map(item => {
return <Option value={item.value}>{item.label}</Option>
return <Option key={item.value} value={item.value}>{item.label}</Option>
})}
</Select>
)}
@ -293,7 +318,7 @@ export default Form.create()(({ match, history, showNotification, form, current_
'"reviewAreaTwo', [],
<Select placeholder="请选择" dropdownClassName="expert_register">
{reviewArea.map(item => {
return <Option value={item.value}>{item.label}</Option>
return <Option key={item.value} value={item.value}>{item.label}</Option>
})}
</Select>)}
</td>
@ -302,7 +327,7 @@ export default Form.create()(({ match, history, showNotification, form, current_
'reviewAreaThree', [],
<Select placeholder="请选择" dropdownClassName="expert_register">
{reviewArea.map(item => {
return <Option value={item.value}>{item.label}</Option>
return <Option key={item.value} value={item.value}>{item.label}</Option>
})}
</Select>)}
</td>
@ -399,6 +424,7 @@ export default Form.create()(({ match, history, showNotification, form, current_
</Form.Item>
</td>
</tr>
</tbody>
</table>
</div>
<div className='buts'>
@ -421,7 +447,7 @@ export default Form.create()(({ match, history, showNotification, form, current_
<Modal
title="提交资料"
visible={cancelConfirmValue}
onOk={()=>{history.go(-1)}}
onOk={() => { history.go(-1) }}
onCancel={() => setCancelConfirmValue(false)}
wrapClassName="expert_modal"
>