@@ -158,7 +158,7 @@ export default (props) => {
稿件状态：{item.read ? '雇主已浏览' : '雇主未浏览'}
{ setReportVisible(true); setCheckedItem(item) }}>举报
- { commentEdit(item.id) }}>{item.comments.length}
+ { commentEdit(item.id) }}>{item.comments ? item.comments.length : 0}
{ thumbUp(item.id) }}>{item.thumbsUp}
diff --git a/src/military/task/components/itemListAchieve/index.scss b/src/military/task/components/itemListPaper/index.scss
similarity index 100%
rename from src/military/task/components/itemListAchieve/index.scss
rename to src/military/task/components/itemListPaper/index.scss
diff --git a/src/military/task/index.scss b/src/military/task/index.scss
new file mode 100644
index 00000000..2480e54b
--- /dev/null
+++ b/src/military/task/index.scss
@@ -0,0 +1,46 @@
+// 本功能模块公告样式
+.task-manage {
+ margin-top: 1.25rem;
+ .status-list {
+ margin: 0 1.5rem;
+ }
+
+ .center-screen {
+ display: flex;
+ justify-content: space-between;
+ height: 4.5rem;
+ margin: 1.25rem 0;
+ background-color: #fff;
+ }
+ .center-left-but {
+ .circle-button {
+ border-radius: 1rem;
+ margin-right: 0.5rem;
+ }
+ }
+
+ .ant-form-item {
+ margin: 0 1rem 0 0;
+ }
+ .ant-form-item-control-wrapper {
+ display: inline-block;
+ }
+ .ant-select {
+ min-width: 200px;
+ }
+ .ant-table-thead th {
+ text-align: center;
+ &:first-child {
+ text-align: left;
+ }
+ }
+ td {
+ text-align: center;
+ color: #333;
+ &:first-child {
+ text-align: left;
+ font-weight: bold;
+ font-size: 1rem;
+ }
+ }
+}
diff --git a/src/military/task/myTask/joinTask.jsx b/src/military/task/myTask/joinTask.jsx
index 4f438d6c..f10fc35a 100644
--- a/src/military/task/myTask/joinTask.jsx
+++ b/src/military/task/myTask/joinTask.jsx
@@ -21,7 +21,7 @@ export default ({ taskCategoryValueArr }) => {
const [paperStatusString, setPaperStatusString] = useState('0,1,2,3,4');
const [taskStatusString, setTaskStatusString] = useState('3,4,5,6,7,8');
- const [requireAchieve, setRequireAchieve] = useState('1');
+ const [requirePaper, setRequirePaper] = useState('1');
const [searchInput, setSearchInput] = useState('');
const [orderBy, setOrderBy] = useState('createdAtDesc');
@@ -112,7 +112,7 @@ export default ({ taskCategoryValueArr }) => {
setCurPage(1);
}, [])
- function changeRequireAchieve(key) {
+ function changeRequirePaper(key) {
if (key === '1') {
setPaperStatusString('0,1,2,3,4');
} else {
@@ -120,14 +120,14 @@ export default ({ taskCategoryValueArr }) => {
setPaperStatusString('0,1,2,3,4');
}
setCurPage(1);
- setRequireAchieve(key);
+ setRequirePaper(key);
}
return (
{
+ const { getFieldDecorator, validateFields, setFieldsValue, getFieldsValue } = form;
+
+ const [loading, setLoading] = useState(false);
+ const [searchObj, setSearchObj] = useState({});
+ const [curPage, setCurPage] = useState(1);
+ const [total, setTotal] = useState(0);
+ const [taskList, setTaskList] = useState([]);
+
+ const [reload, setReload] = useState(0);
+ const [visible, setVisible] = useState(false);
+ const [activeId, setActiveId] = useState('');
+ const [pass, setPass] = useState(2);
+ const [message, setMessage] = useState('');
+
+
+ useEffect(() => {
+ const params = {
+ ...searchObj,
+ orderBy: 'createdAtDesc',
+ curPage,
+ pageSize: 10,
+ };
+ setLoading(true);
+ getTaskPaper(params).then(data => {
+ if (data) {
+ setTaskList(data.rows);
+ setTotal(data.total);
+ }
+ setLoading(false);
+ })
+ }, [reload, curPage, searchObj]);
+
+
+ const helper = useCallback(
+ (label, name, rules, widget, initialValue) => (
+
+ {getFieldDecorator(name, { rules, initialValue, validateFirst: true, })(widget)}
+
+ ), []);
+
+
+ function onSearch() {
+ validateFields((err, values) => {
+ if (!err) {
+ if (values.startTime) values.startTime = values.startTime.format(format);
+ if (values.endTime) values.endTime = values.endTime.format(format);
+ if (values.verifyStatus === '-1') values.verifyStatus = '';
+ setSearchObj(values);
+ }
+ });
+ }
+
+ function clearSearch() {
+ setFieldsValue({
+ startTime: '',
+ endTime: '',
+ verifyStatus: '-1'
+ });
+ setSearchObj({});
+ }
+
+ const columns = useMemo(() => {
+ return [
+ {
+ title: '来源任务',
+ dataIndex: 'name',
+ render: (text, record) => (
+
+ {text}
+
+ ),
+ },
+ {
+ title: '评论/成果内容',
+ dataIndex: 'content',
+ render: (text, record) => {
+ return record.paperDetail ? : ''
+ }
+ },
+ {
+ title: '评论/提交者',
+ dataIndex: 'user',
+ render: (text, record) => {
+ return record.user.nickname || record.user.login
+ }
+ },
+ {
+ title: '评论/提交时间',
+ dataIndex: 'createdAt',
+
+ },
+ {
+ title: '审核状态',
+ dataIndex: 'verifyStatus',
+ render: (text, record) => {
+ return text ? '通过' : '未通过'
+ }
+ },
+ {
+ title: '操作',
+ key: 'action',
+ render: (text, record) => (
+
+
+
+ {/* 查看详情 */}
+
+ ),
+ },
+ ]
+ }, []);
+
+ function checkPaperItem(paperId, passStatus) {
+ checkPaper({
+ paperId,
+ auditingVo: {
+ pass: passStatus ? 1 : pass,
+ message,
+ }
+ }).then(res => {
+ console.log(res);
+ });
+ }
+
+ return (
+
+
+
+
+ {helper(
+ "",
+ "verifyStatus",
+ [],
+ ,
+ '-1'
+ )}
+
+
+
+
+
+ {helper(
+ "发布时间:",
+ "startTime",
+ [],
+
+ )}
+
+ {helper(
+ "",
+ "endTime",
+ [],
+
+ )}
+
+
+
+
+
+
+
+
+
+
+
row.id}
+ dataSource={taskList}
+ columns={columns}
+ pagination={false}
+ className="mt10"
+ />
+ {taskList.length > 10 &&
+ { setCurPage(page) }}
+ current={curPage}
+ total={total}
+ />}
+
+
+
+ { checkPaperItem(activeId, false) }}
+ onCancel={() => { setVisible(false) }}
+ className="form-edit-modal"
+ >
+ { setPass(e.target.value) }}>
+ 允许申诉
+ 不允许申诉
+
+