@@ -137,11 +151,13 @@ console.log('members', members);
}
{helper('电话',
'phone',
- [{ required: true, message: "请正确输入报名信息" }],
- {verify("phone")}}/>
+ [{ required: true, message: "请正确输入报名信息" },
+ {pattern: /^1(?:3\d|4[4-9]|5[0-35-9]|6[67]|7[013-8]|8\d|9\d)\d{8}$/, message: "请输入正确的手机号"}],
+ {verify("phone")}}/>
)}
-
diff --git a/src/military/qz2022/apply/index.scss b/src/military/qz2022/apply/index.scss
index 950061de..528d3d4c 100644
--- a/src/military/qz2022/apply/index.scss
+++ b/src/military/qz2022/apply/index.scss
@@ -43,6 +43,8 @@
display: inline-block;
width: 33%;
margin-right: 160px;
+ margin-bottom: 0px;
+ .ant-input:hover{border-color:#2e5bfe;}
}
.class_from{
display: inline;
@@ -104,6 +106,9 @@
&:hover{cursor: pointer;}
}
}
+ .error_message{
+ color: #f5222d;
+ }
}
.apply_but{
padding-bottom: 60px;
diff --git a/src/military/qz2022/editTable/index.jsx b/src/military/qz2022/editTable/index.jsx
index 7d30e05a..ec6f0a29 100644
--- a/src/military/qz2022/editTable/index.jsx
+++ b/src/military/qz2022/editTable/index.jsx
@@ -17,7 +17,6 @@ class EditableCell extends React.Component {
save = (dataIndex, e) => {
const { record, handleSave } = this.props;
- console.log(dataIndex);
this.form.validateFields([dataIndex],(error, values) => {
if (error && error[e.currentTarget.id]) {
return;
@@ -67,28 +66,27 @@ class EditableCell extends React.Component {
class EditableTable extends React.Component {
constructor(props) {
- console.log(props,'表格');
super(props);
this.columns = [
{
title: '姓名',
- dataIndex: 'name',
+ dataIndex: 'real_name',
editable: true,
},
{
title: '单位',
- dataIndex: 'age',
+ dataIndex: 'org_name',
editable: true,
width: '30%',
},
{
title: '职务',
- dataIndex: 'address',
+ dataIndex: 'org_job',
editable: true,
},
{
title: 'JXJXJX',
- dataIndex: 'militaryRank',
+ dataIndex: 'org_rank',
editable: true,
},
{
@@ -108,10 +106,6 @@ class EditableTable extends React.Component {
dataSource: [
{
key: '0',
- name: '',
- age: '',
- address: '',
- militaryRank: ''
}
],
count: 1,
diff --git a/src/military/qz2022/index.scss b/src/military/qz2022/index.scss
index 2bbc759c..9008be73 100644
--- a/src/military/qz2022/index.scss
+++ b/src/military/qz2022/index.scss
@@ -42,12 +42,13 @@
}
.qzCont {
min-height: 35vh;
- border-radius: 4px;
- box-shadow: 0px 3px 12px #ecf0ff;
+ border-radius:4px;
}
}
.qz_manage {
- top: 510px !important;
+ .ant-popover-inner-content{
+ padding: 0;
+ }
.ant-dropdown-menu-item > a {
color: #333;
&:hover {
diff --git a/src/military/qz2022/management/index.jsx b/src/military/qz2022/management/index.jsx
index b668b55a..ccf022ee 100644
--- a/src/military/qz2022/management/index.jsx
+++ b/src/military/qz2022/management/index.jsx
@@ -1,5 +1,5 @@
import React, { useState, useCallback, useMemo, useEffect } from "react";
-import { Input, Select, Button, Form, DatePicker, Table, Pagination, Upload, Modal } from 'antd';
+import { Input, Select, Button, Form, DatePicker, Table, Pagination, Upload, Modal, Icon } from 'antd';
import { Link } from "react-router-dom";
import { formatDuring } from 'educoder';
import {competitionArea, competitionType} from '../static.js';
@@ -7,9 +7,11 @@ import PaginationTable from "../../components/paginationTable";
import './index.scss';
import '../index.scss';
+import { getQzEnrollList, getQzProList, exportEnrollList } from "../api.js";
const Option = Select.Option;
-function Introduce({ form, showNotification, match, history:{location:{pathname}} }) {
+function Introduce({ form, showNotification, match, history:{location:{pathname}},qzDetail }) {
+ console.log(qzDetail);
// 报名列表和作品列表到指向此处，type做区分，0报名，1作品
const [type, setType] = useState(pathname.substring(pathname.lastIndexOf('/')+1, pathname.lenght));
const [reload, setReload] = useState();
@@ -18,103 +20,196 @@ function Introduce({ form, showNotification, match, history:{location:{pathname}
const [pageSize, setPageSize] = useState(10);
const [dataList, setDataList] = useState([]);
const [total, setTotal] = useState(0);
+ // 赛区 赛项
+ const [zone, setZone] = useState(undefined);
+ const [subCompetition, setSubCompetition] = useState(undefined);
useEffect(() => {
setType(pathname.substring(pathname.lastIndexOf('/')+1, pathname.lenght));
}, [pathname]);
+
+ useEffect(()=>{
+ console.log(zone, subCompetition);
+ const params = {
+ zone: zone === '-1' ? undefined : zone,
+ sub_competition: subCompetition === '-1' ? undefined : subCompetition
+ }
+ if(type === "applys"){
+ // 报名列表
+ getQzEnrollList(params).then(response=>{
+ console.log(response);
+ if(response && response.message === "success"){
+ setTotal(response.count);
+ setDataList(response.data);
+ }
+ })
+ }else{
+ // 提交作品列表
+ getQzProList(params).then(response=>{
+ if(response && response.message === "success"){
+ setTotal(response.count);
+ setDataList(response.data);
+ }
+ })
+ }
+ }, [type, zone, subCompetition])
const columns_apply = useMemo(() => {
return [
{
title: '参赛单位',
- dataIndex: 'index'
+ dataIndex: 'org_name',
+ width: '10%',
+ align: 'center'
},
{
title: '参赛负责人',
- dataIndex: 'containerName',
- key: 'containerName',
+ dataIndex: 'leader',
+ key: 'leader',
},
{
title: '职务',
- dataIndex: 'reviewEndOn',
- key: 'reviewEndOn',
+ dataIndex: 'org_job',
+ key: 'org_job',
},
{
title: 'JXJXJX',
- dataIndex: 'surplus',
- key: 'surplus',
+ dataIndex: 'org_rank',
+ key: 'org_rank',
},
{
title: '电话',
- dataIndex: 'status',
- key: 'status',
+ dataIndex: 'phone',
+ key: 'phone',
+ },
+ {
+ title: '赛区',
+ dataIndex: 'zone',
+ render:(text, record)=>{
+ return (qzDetail && qzDetail.zones[text]) || '--';
+ }
},
{
title: '赛项',
- dataIndex: 'status',
- key: 'action',
+ dataIndex: 'sub_competition',
+ render:(text, record)=>{
+ return (qzDetail && qzDetail.sub_competitions[text]) || '--';
+ }
},
{
title: '课题来源',
- dataIndex: 'status',
- key: 'status',
+ dataIndex: 'subject_source_type',
+ render:(text, record)=>{
+ return text === '0' ? "自主提报" : record.subject_source_name || '--';
+ }
},
{
title: '成员',
- dataIndex: 'status',
- key: 'action',
+ dataIndex: 'members',
+ render:(text, record)=>{
+ console.log('members', text);
+ return '';
+ }
}
];
- }, []);
+ }, [qzDetail]);
const columns_production = useMemo(() => {
return [
{
title: '参赛单位',
- dataIndex: 'index'
+ dataIndex: 'org_name'
},
{
title: '参赛负责人',
- dataIndex: 'containerName',
- key: 'containerName',
+ dataIndex: 'leader',
},
{
title: '赛区',
- dataIndex: 'reviewEndOn',
- key: 'reviewEndOn',
+ dataIndex: 'zone',
+ render:(text, record)=>{
+ return (qzDetail && qzDetail.zones[text]) || '--';
+ }
},
{
title: '赛项',
- dataIndex: 'surplus',
- key: 'surplus',
+ dataIndex: 'sub_competition',
+ render:(text, record)=>{
+ return (qzDetail && qzDetail.sub_competitions[text]) || '--';
+ }
},
{
title: '作品',
- dataIndex: 'status',
- key: 'status',
+ dataIndex: 'sttachments',
},
];
- }, []);
+ }, [qzDetail]);
+ const expandRow = (record) =>{
+ return 成员
+成员 :
+{errorMessage}
{/* */}
+
+ }
+
+ const customExpandIcon1 = useMemo((props)=>{
+ // console.log(props);
+ },[dataList])
+
+ const customExpandIcon = (props) => {
+ console.log(props);
+ if(props.record.members.length > 0){
+ if (props.expanded) {
+ return {
+ props.onExpand(props.record, e);
+ }}>查看成员
+ } else {
+ return {
+ props.onExpand(props.record, e);
+ }}>查看成员
+ }
+ }else{
+ return
+ }
+ }
+
+ function exportApplyInfo(){
+ exportEnrollList();
+ }
+
return (
+
+ {record.members && record.members.map((item, index)=>{
+ return 序号
+ 姓名
+ 单位
+ 职务
+ 军衔
+
+
+ })}
+ {index+1}
+ {item.real_name}
+ {item.org_job}
+ {item.org_rank}
+ {item.org_name}
+ 启智2022{type === "applys" ? "报名" : "作品"}列表
-
+ current={curPage}
+ expandedRowRender={expandRow}
+ expandIconColumnIndex={8}
+ expandIconAsCell={false}
+ expandIcon={customExpandIcon}/>
)
}
diff --git a/src/military/qz2022/management/index.scss b/src/military/qz2022/management/index.scss
index 24782cb1..7feaf794 100644
--- a/src/military/qz2022/management/index.scss
+++ b/src/military/qz2022/management/index.scss
@@ -17,4 +17,10 @@
.pagination-table.qzManageTable {
padding: 0 30px;
}
+ .expandRowManage .row div{
+ display: inline-block;
+ width: 17%;
+ text-align: center;
+ &.job{width: 30%;}
+ }
}
diff --git a/src/military/qz2022/refer/Upload.jsx b/src/military/qz2022/refer/Upload.jsx
new file mode 100644
index 00000000..8722e054
--- /dev/null
+++ b/src/military/qz2022/refer/Upload.jsx
@@ -0,0 +1,94 @@
+import React, { useEffect, useState } from "react";
+import { Upload, Button } from 'antd';
+import { appendFileSizeToUploadFileAll } from 'educoder';
+import { httpUrl } from '../fetch';
+
+function Uploads({ className, size, actionUrl, fileList, showNotification, load, accept, disabled,count }) {
+ const [files, setFiles] = useState(undefined);
+
+ useEffect(() => {
+ if (fileList) {
+ init();
+ }
+ }, [fileList]);
+
+ function init() {
+ let f = appendFileSizeToUploadFileAll(fileList);
+ setFiles(f);
+ }
+ function onAttachmentRemove(file) {
+ if (!file.percent || file.percent === 100) {
+ deleteAttachment(file);
+ return false;
+ }
+ }
+ function deleteAttachment(file) {
+ let id = (file.response && file.response.data && file.response.data.id) || file.id;
+
+ // 暂时不直接删除上传的文件，只在最后保存的时候进行修改
+ let nf = files.filter(item => {
+ let itemId = (item.response && item.response.data && item.response.data.id) || item.id;
+ return itemId !== id;
+ });
+ setFiles(nf);
+ backFiles(nf);
+ }
+
+ function backFiles(fileList) {
+ let filesId = [];
+ for (const item of fileList) {
+ if (item) {
+ let itemId = (item.response && item.response.data && item.response.data.id) || item.id;
+ itemId && filesId.push(itemId);
+ }
+ }
+ load && load(fileList, filesId.join());
+ }
+
+
+ function handleChange(info) {
+ if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
+ let fileList = info.fileList;
+ if(count){
+ fileList = fileList.slice(-count);
+ }
+ setFiles(appendFileSizeToUploadFileAll(fileList));
+ if (info.file.response) {
+ for (let i = 0; i < fileList.length; i++) {
+ if (fileList[i].response && !fileList[i].response.data) {
+ fileList.splice(i, 1);
+ }
+ }
+ backFiles(fileList);
+ if (!info.file.response.data) {
+ info.file.response && showNotification(info.file.response.message)
+ }
+ }
+ }
+ }
+
+ function beforeUpload(file) {
+ const isLt100M = file.size / 1024 / 1024 < size;
+ if (!isLt100M) {
+ showNotification(`文件大小必须小于${size}MB!`);
+ }
+ return isLt100M;
+ }
+
+ const upload = {
+ name: 'file',
+ fileList: files,
+ disabled: disabled,
+ action: (httpUrl || actionUrl) + `/busiAttachments/upload`,
+ onChange: handleChange,
+ onRemove: onAttachmentRemove,
+ beforeUpload: beforeUpload,
+ };
+ return (
+
+
赛区：
-
- {type === "applys" && }
+ {type === "applys" && }
上传小于等于256m的作品压缩包（仅限上传一个压缩包）
+ 上传小于等于256m的作品压缩包（仅限上传一个压缩包,格式如下: .zip, .rar, .tar）
-
+