From c9789564630ff80db032a8998db8732a9c87c5a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= <1261960504@qq.com> Date: Wed, 29 Dec 2021 19:49:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dissue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/military/components/adminRouter/index.jsx | 20 +-- .../components/paginationTable/index.jsx | 5 +- .../components/paginationTable/index.scss | 33 +++-- src/military/expert/components/Upload.jsx | 5 +- src/military/expert/expertList/index.jsx | 20 ++- src/military/expert/index.scss | 3 +- src/military/expert/register/index.jsx | 46 ++++--- src/military/expert/register/index.scss | 5 +- src/military/expert/registerList/index.jsx | 115 ++++++++++++++---- src/military/expert/review/review.jsx | 4 +- src/military/expert/selectExpert/index.jsx | 2 +- src/military/index.scss | 4 + 12 files changed, 189 insertions(+), 73 deletions(-) diff --git a/src/military/components/adminRouter/index.jsx b/src/military/components/adminRouter/index.jsx index 9a4602ca..a6a37ab1 100644 --- a/src/military/components/adminRouter/index.jsx +++ b/src/military/components/adminRouter/index.jsx @@ -34,7 +34,7 @@ export default props => { 支付报酬凭证上传 - 任务列表 + 创客任务列表 创意征集评论 }); @@ -45,12 +45,12 @@ export default props => { }); - const expertMenu = useMemo(() => { - return - 专家注册审核 - 专家库 - - }); + // const expertMenu = useMemo(() => { + // return + // 专家注册审核 + // 专家库 + // + // }); const userMenu = useMemo(() => { return @@ -58,6 +58,8 @@ export default props => { 主体信息列表 试用授权列表 自动授权列表 + 专家注册列表 + 专家库列表 }); @@ -123,9 +125,9 @@ export default props => {
竞赛
- + {/*
专家
- + */}
用户
diff --git a/src/military/components/paginationTable/index.jsx b/src/military/components/paginationTable/index.jsx index 4fe03e27..770ed8ec 100644 --- a/src/military/components/paginationTable/index.jsx +++ b/src/military/components/paginationTable/index.jsx @@ -6,7 +6,7 @@ export default (props) => { const { loading, dataSource, columns, handleRow, total, setCurPage, current, rowSelection, expandedRowRender, expandIconColumnIndex } =props; return ( - +
row.id} @@ -21,11 +21,12 @@ export default (props) => { /> {total > 10 && } - + ) } diff --git a/src/military/components/paginationTable/index.scss b/src/military/components/paginationTable/index.scss index b2d92d78..fe235cde 100644 --- a/src/military/components/paginationTable/index.scss +++ b/src/military/components/paginationTable/index.scss @@ -1,14 +1,27 @@ -.ant-table-wrapper{ - ::-webkit-scrollbar{ - width: 5px; - height: 5px; - } - .ant-table-hide-scrollbar{ - margin-bottom: -5px; - overflow-y: hidden !important; - ::-webkit-scrollbar{ +.pagination-table { + .ant-table-wrapper { + ::-webkit-scrollbar { width: 5px; height: 5px; } + .ant-table-hide-scrollbar { + margin-bottom: -5px; + overflow-y: hidden !important; + ::-webkit-scrollbar { + width: 5px; + height: 5px; + } + } } -} \ No newline at end of file + + .ant-pagination{ + margin-top:1.25rem; + text-align: right; + } + + // .ant-table-row-cell-break-word{ + // .ant-btn{ + // display: inline-block; + // } + // } +} diff --git a/src/military/expert/components/Upload.jsx b/src/military/expert/components/Upload.jsx index c809c77e..fccf5d7f 100644 --- a/src/military/expert/components/Upload.jsx +++ b/src/military/expert/components/Upload.jsx @@ -3,7 +3,7 @@ import { Upload, Button } from 'antd'; import { appendFileSizeToUploadFileAll } from 'educoder'; import { httpUrl } from '../fetch'; -function Uploads({ className, size, actionUrl, fileList, showNotification, load,accept }) { +function Uploads({ className, size, actionUrl, fileList, showNotification, load, accept, disabled }) { const [files, setFiles] = useState(undefined); useEffect(() => { @@ -75,6 +75,7 @@ function Uploads({ className, size, actionUrl, fileList, showNotification, load, const upload = { name: 'file', fileList: files, + disabled: disabled, action: (httpUrl || actionUrl) + `/busiAttachments/upload`, onChange: handleChange, onRemove: onAttachmentRemove, @@ -82,7 +83,7 @@ function Uploads({ className, size, actionUrl, fileList, showNotification, load, }; return ( - + (你可以上传小于{size}MB的文件) ) diff --git a/src/military/expert/expertList/index.jsx b/src/military/expert/expertList/index.jsx index e8bae4c5..241815bb 100644 --- a/src/military/expert/expertList/index.jsx +++ b/src/military/expert/expertList/index.jsx @@ -54,6 +54,9 @@ function RegisterList({ showNotification }) { { title: '工作单位', dataIndex: 'workplace', + key: 'workplace', + // width: 250, + }, { title: '单位类别', @@ -68,11 +71,11 @@ function RegisterList({ showNotification }) { { title: '专业职称', dataIndex: 'professionalTitle', - width: 80, + width: 100, }, { title: '职称职级', - dataIndex: 'professionalYears', + dataIndex: 'titleRank', width: 80, }, { @@ -83,14 +86,17 @@ function RegisterList({ showNotification }) { { title: '评审领域1', dataIndex: 'reviewAreaOne', + width: 100, }, { title: '评审领域2', dataIndex: 'reviewAreaTwo', + width: 100, }, { title: '评审领域3', dataIndex: 'reviewAreaThree', + width: 100, }, { title: '毕业院校', @@ -108,10 +114,12 @@ function RegisterList({ showNotification }) { { title: '邮箱地址', dataIndex: 'expertEmail', + width:200, }, { title: '开户银行', dataIndex: 'bankName', + width: 110, }, { title: '银行账号', @@ -249,11 +257,11 @@ function RegisterList({ showNotification }) {
- + { setSearchInput(value); setCurPage(1); }} /> @@ -290,7 +298,7 @@ function RegisterList({ showNotification }) { > - + {/* */}
@@ -302,7 +310,7 @@ function RegisterList({ showNotification }) { total={total} setCurPage={setCurPage} current={curPage} - scroll={{ x: 2100, y: 600 }} + scroll={{ x: 2300 }} />
*/} { - lastRegister && lastRegister.status === -1 &&

+ lastRegister && lastRegister.status === -1 &&

您的资料正在审核，请稍候

} @@ -267,6 +271,7 @@ export default Form.create()(({ match, history, showNotification, form, current_ { max: 20, message: '长度不能超过20个字符' }], ) } @@ -286,6 +291,7 @@ export default Form.create()(({ match, history, showNotification, form, current_ }], ) } @@ -293,7 +299,7 @@ export default Form.create()(({ match, history, showNotification, form, current_ helper('单位类别', 'workplaceType', [{ required: true, message: "请选择单位类别" }], - {unitType.map(item => { return })} @@ -307,6 +313,7 @@ export default Form.create()(({ match, history, showNotification, form, current_ { max: 50, message: '长度不能超过50个字符' }], ) } @@ -314,7 +321,7 @@ export default Form.create()(({ match, history, showNotification, form, current_ helper('专家类别', 'expertType', [{ required: true, message: "请选择专家类别" }], - {professionalType.map(item => { return })} @@ -323,8 +330,8 @@ export default Form.create()(({ match, history, showNotification, form, current_ } { helper('评审领域2', - '"reviewAreaTwo', [], - {reviewArea.map(item => { return })} @@ -336,6 +343,7 @@ export default Form.create()(({ match, history, showNotification, form, current_ 'graduatedFrom', [{ max: 50, message: '长度不能超过50个字符' }], ) } @@ -355,6 +363,7 @@ export default Form.create()(({ match, history, showNotification, form, current_ }], ) } @@ -363,6 +372,7 @@ export default Form.create()(({ match, history, showNotification, form, current_ 'bankName', [{ max: 50, message: '长度不能超过50个字符' }], ) } @@ -372,6 +382,7 @@ export default Form.create()(({ match, history, showNotification, form, current_ size={100} showNotification={showNotification} fileList={resumeList} + disabled={forbidden} /> @@ -380,6 +391,7 @@ export default Form.create()(({ match, history, showNotification, form, current_ size={100} showNotification={showNotification} fileList={achievementList} + disabled={forbidden} /> @@ -388,7 +400,7 @@ export default Form.create()(({ match, history, showNotification, form, current_ helper('最高学历', 'highestDegree', [{ required: true, message: '请选择最高学历' }], - {highestEducation.map(item => { return })} @@ -401,6 +413,7 @@ export default Form.create()(({ match, history, showNotification, form, current_ [{ required: true, message: "工作单位不能为空" }], ) } @@ -408,7 +421,7 @@ export default Form.create()(({ match, history, showNotification, form, current_ helper('工作性质', 'workNature', [{ required: true, message: "请选择工作性质" }], - {natureOfWork.map(item => { return })} @@ -419,7 +432,7 @@ export default Form.create()(({ match, history, showNotification, form, current_ helper('职称职级', 'titleRank', [{ required: true, message: "请选择职称职级" }], - {positionLevel.map(item => { return })} @@ -430,7 +443,7 @@ export default Form.create()(({ match, history, showNotification, form, current_ helper('评审领域1', 'reviewAreaOne', [{ required: true, message: "请选择评审领域" }], - {reviewArea.map(item => { return })} @@ -440,7 +453,7 @@ export default Form.create()(({ match, history, showNotification, form, current_ { helper('评审领域3', 'reviewAreaThree', [], - {reviewArea.map(item => { return })} @@ -452,6 +465,7 @@ export default Form.create()(({ match, history, showNotification, form, current_ 'major', [{ max: 50, message: '长度不能超过50个字符' }], ) } @@ -469,6 +483,7 @@ export default Form.create()(({ match, history, showNotification, form, current_ }], ) } @@ -477,6 +492,7 @@ export default Form.create()(({ match, history, showNotification, form, current_ 'bankAccount', [{ max: 50, message: '长度不能超过50个字符' }], ) } @@ -486,6 +502,7 @@ export default Form.create()(({ match, history, showNotification, form, current_ size={100} showNotification={showNotification} fileList={titleCertList} + disabled={forbidden} /> @@ -494,16 +511,17 @@ export default Form.create()(({ match, history, showNotification, form, current_ size={100} showNotification={showNotification} fileList={honorList} + disabled={forbidden} />
- {/* - + {/* + */} - - + + { return [{ title: '姓名', dataIndex: 'expertName', - width: 55, + width: 75, key: 'expertName', fixed: 'left', // render: (text, record) => { @@ -30,52 +34,59 @@ function RegisterList({ showNotification }) { { title: '最高学历', dataIndex: 'highestDegree', - width: 100, key: 'highestDegree', - fixed: 'left', + width: 80, }, { title: '手机号码', dataIndex: 'phone', - width: 100, key: 'phone', - fixed: 'left', }, { title: '工作单位', dataIndex: 'workplace', + key: 'workplace', + width: 350, }, { title: '单位类别', dataIndex: 'workplaceType', + width: 80, }, { title: '工作性质', dataIndex: 'workNature', + width: 80, }, { title: '专业职称', dataIndex: 'professionalTitle', + width: 100, }, { title: '职称职级', - dataIndex: 'professionalYears', + dataIndex: 'titleRank', + width: 80, }, { - title: '专家类别', + title: '专业类别', dataIndex: 'expertType', + width: 80, }, { title: '评审领域1', dataIndex: 'reviewAreaOne', + width: 100, }, { title: '评审领域2', dataIndex: 'reviewAreaTwo', + width: 100, }, { title: '评审领域3', dataIndex: 'reviewAreaThree', + width: 100, }, { title: '毕业院校', @@ -88,23 +99,22 @@ function RegisterList({ showNotification }) { { title: '身份证号', dataIndex: 'idNumber', + width: 170, }, { title: '邮箱地址', dataIndex: 'expertEmail', + width: 200, }, { title: '开户银行', dataIndex: 'bankName', + width: 110, }, { title: '银行账号', dataIndex: 'bankAccount', }, - { - title: '个人简介', - dataIndex: 'resume', - }, // { // title: '职称证明', // dataIndex: 'titleCertificate', @@ -121,12 +131,12 @@ function RegisterList({ showNotification }) { { title: '操作', dataIndex: 'action', - width: 80, + width: 120, fixed: 'right', render: (text, record) => { return - - + + } } @@ -155,9 +165,9 @@ function RegisterList({ showNotification }) { }, [curPage, reload, searchInput]); function check(record, checkStatus) { - Modal.confirm({ - title: "警告", - content: checkStatus == '1' ? "确认通过吗？通过后该用户将成为专家库的一员" : "确认拒绝吗？拒绝后该用户此次不能成为专家", + Confirm({ + title: "提醒", + content: checkStatus == '1' ? "您确定要审核通过吗？通过后该用户将成为专家库的一员" : "您确定要拒绝吗？拒绝后该用户此次不能成为专家", okText: '确定', cancelText: '取消', onOk() { @@ -175,6 +185,42 @@ function RegisterList({ showNotification }) { }); } + const helper = useCallback( + (name, rules, widget) => ( + + {getFieldDecorator(name, { rules, validateFirst: true })(widget)} + + ), + [] + ); + + function refuse() { + validateFields((err, values) => { + if (!err) { + registerCheck({ + expertId: active.id, + isPassed: 2, + userId: active.userId, + reviewerAdvice:values.reviewerAdvice, + }).then(res => { + if (res.message === 'success') { + showNotification('操作成功!'); + setReload(Math.random()); + setFieldsValue({ + reviewerAdvice:'' + }); + setVisible(false); + setActive({}); + } + }); + } + }); + + + } + + + return (
@@ -182,7 +228,7 @@ function RegisterList({ showNotification }) { { setSearchInput(value); setCurPage(1); }} />
@@ -194,8 +240,27 @@ function RegisterList({ showNotification }) { total={total} setCurPage={setCurPage} current={curPage} - scroll={{ x: 1600, y: 600 }} + scroll={{ x: 2300 }} /> + + { setVisible(false) }} + className="form-edit-modal" + > + {helper( + "reviewerAdvice", + [{ required: visible, message: '请给出拒绝的原因' }], +