+
+
+ (
+
+ (
+
+ (
+
+ (
+
+ (
+
+ (
+
+
+ {/* (
+ this.props.current_user && this.props.current_user.login ?
+ */}
+
+
+ );
+ }
+}
+export default withRouter(
+ ImageLayerOfCommentHOC({
+ imgSelector: ".imageLayerParent img, .imageLayerParent .imageTarget",
+ parentSelector: ".newMain",
+ })(CNotificationHOC()(SnackbarHOC()(TPMIndexHOC(Index))))
+);
diff --git a/src/achieveRequirement/achieve/achieveDetail/index.jsx b/src/achieveRequirement/achieve/achieveDetail/index.jsx
new file mode 100644
index 00000000..e7a95f03
--- /dev/null
+++ b/src/achieveRequirement/achieve/achieveDetail/index.jsx
@@ -0,0 +1,142 @@
+import React, { useEffect, useState } from 'react';
+import { Descriptions, Modal } from 'antd';
+import { Document, Page, pdfjs } from 'react-pdf';
+import DelModal from '../../components/DelModal';
+import { httpUrl } from '../../../fetch';
+import { deleteAchieve, getAchieveDetail } from '../api';
+import './index.scss';
+
+pdfjs.GlobalWorkerOptions.workerSrc = `//cdnjs.cloudflare.com/ajax/libs/pdf.js/${pdfjs.version}/pdf.worker.js`;
+
+export default (props) => {
+ const { match, history, current_user } = props;
+ const id = match.params.achieveId;
+ const [achiveForm, setAchiveForm] = useState({});
+ const [createUserId, setCreateUserId] = useState("");
+ const [visible, setVisible] = useState(false);
+ const [fileType, setFileType] = useState(4);
+ const [fileUrl, setFileUrl] = useState(4);
+ const [numPages, setNumPages] = useState(null);
+
+ useEffect(() => {
+ getAchieveDetail(id).then(data => {
+ setAchiveForm(data);
+ setCreateUserId(data.user.id);
+ })
+ }, [id]);
+
+ function editItem() {
+ props.history.push(`/achieve/achieveEdit/${id}`);
+ }
+
+ function deletItem() {
+ DelModal(() => {
+ deleteAchieve(id).then(res => {
+ if (res.code === '1') {
+ props.showNotification("删除成功");
+ history.go(-1);
+ } else {
+ props.showNotification("删除失败");
+ }
+ })
+ });
+ }
+
+ function downFile(item) {
+ let url = httpUrl + '/busiAttachments/download/' + item.id;
+ window.open(url);
+ }
+
+ function pdfShow(e) {
+ setFileType(e.fileType);
+ if (e.fileType === 1 || e.fileType === 2 || e.fileType === 3) {
+ // pdf||video||img
+ setVisible(true);
+ setFileUrl(httpUrl + '/busiAttachments/view/' + e.id);
+ }
+ }
+
+ function onDocumentLoadSuccess({ numPages }) {
+ setNumPages(numPages);
+ }
+
+ return (
+
+ { setVisible(false) }}
+ className="file-modal"
+ >
+ {
+ fileType === 3 &&
+
+ )
+}
diff --git a/src/achieveRequirement/achieve/achieveDetail/index.scss b/src/achieveRequirement/achieve/achieveDetail/index.scss
new file mode 100644
index 00000000..1024b07f
--- /dev/null
+++ b/src/achieveRequirement/achieve/achieveDetail/index.scss
@@ -0,0 +1,33 @@
+// 内容详情
+.item-content {
+ padding: 10px 10px 0 30px;
+}
+.ant-descriptions-item-label {
+ width: 5em;
+ margin-right: 5px;
+ color: rgba(0, 0, 0, 0.65);
+ text-align: right;
+}
+.ant-descriptions-item-content {
+ color: rgba(0, 0, 0, 1);
+}
+.file-list-item > span {
+ vertical-align: top;
+}
+.file-list-box {
+ width: 600px;
+ height: 60px;
+ display: flex;
+ justify-content: space-between;
+ p:hover {
+ cursor: pointer;
+ color: #0089ff;
+ }
+ .downP {
+ color: #0089ff;
+ cursor: pointer;
+ text-decoration: none;
+ }
+}
+
+
diff --git a/src/achieveRequirement/achieve/achieveEdit/index.jsx b/src/achieveRequirement/achieve/achieveEdit/index.jsx
new file mode 100644
index 00000000..0e5cb2dd
--- /dev/null
+++ b/src/achieveRequirement/achieve/achieveEdit/index.jsx
@@ -0,0 +1,236 @@
+import React, { forwardRef, useCallback, useEffect, useState } from 'react';
+import { Form, Input, Select, Button, } from 'antd';
+import Upload from '../../components/Upload';
+import { httpUrl } from '../../../fetch';
+import { getDictionary, getAchieveDetail, addAchieve, editAchieve } from '../api';
+import './index.scss';
+
+const Option = Select.Option;
+const { TextArea } = Input;
+
+export default Form.create()(
+ forwardRef(({ form, showNotification, match, history }, ref) => {
+ const [shareType, setShareType] = useState([]);
+ const [tagType, setTagType] = useState([]);
+ const [fileList, setFileList] = useState(null);
+ const [achievementFileTypes, setAchievementFileTypes] = useState('');
+
+ const id = match.params.achieveId;
+ const { getFieldDecorator, validateFields, setFieldsValue } = form;
+
+ useEffect(() => {
+ id && getAchieveDetail(id).then(data => {
+ const formValue = {
+ achievementName: data.achievementName,
+ achievementTypeId: data.achievementTypeId,
+ achievementBelong: data.achievementBelong,
+ achievementLabel: data.achievementLabel,
+ achievementRemark: data.achievementRemark,
+ achievementFiles: data.achievementFiles
+ };
+ setFieldsValue(formValue);
+ if (data.achievementAttachments.length) {
+ for (const item of data.achievementAttachments) {
+ item.name = item.fileName;
+ item.size = item.fileSize;
+ item.uid = "rc-upload" + item.id
+ }
+ setFileList(data.achievementAttachments);
+ }
+ })
+ }, [id]);
+
+ // 加载选项数据
+ useEffect(() => {
+ getDictionary('share_type').then((res) => {
+ setShareType(res.data);
+ });
+ getDictionary("tag_type").then((res) => {
+ setTagType(res.data);
+ });
+ }, []);
+
+ // 上传附件后得到的文件数组
+ function UploadFunc(fileList) {
+ setFileList(fileList);
+ let files = [];
+ let fileTypes = [];
+ for (const item of fileList) {
+ files.push(item.id || item.response.data.id);
+ fileTypes.push(item.fileType || item.response.data.fileType);
+ }
+ setFieldsValue({
+ achievementFiles: files.join()
+ });
+ setAchievementFileTypes(fileTypes.join());
+ }
+
+ const helper = useCallback(
+ (label, name, rules, widget) => (
+
+
+ {achiveForm.achievementType && achiveForm.achievementType.dicItemName}
+
+ {
+ achiveForm.achievementLabel && achiveForm.achievementLabel.map(itemx => {
+ return {itemx}
+ })
+ }
+
+ {achiveForm.achievementBelong}
+ {achiveForm.updatedAt}
+ {achiveForm.achievementRemark}
+
+ {
+ achiveForm.achievementAttachments && achiveForm.achievementAttachments.map(item => {
+ return
+
+
+
+
+
+
+ {achiveForm.achievementName}
+ {
+ createUserId === current_user.user_id &&
+ 编辑 删除
+ }
+
+
+ })
+ }
+ { pdfShow(item) }}>{item.fileName}
+ { downFile(item) }}>下载 +
+ 
+
+ }
+ {
+ fileType === 2 &&
+
+
+ }
+ {
+ fileType === 1 &&
+ {
+
+ {new Array(numPages).fill("").map((item, index) => {
+ return (
+
+ }
+
+ }
+
+
+ )
+ })
+)
diff --git a/src/achieveRequirement/achieve/achieveEdit/index.scss b/src/achieveRequirement/achieve/achieveEdit/index.scss
new file mode 100644
index 00000000..ad5c9622
--- /dev/null
+++ b/src/achieveRequirement/achieve/achieveEdit/index.scss
@@ -0,0 +1,4 @@
+ .achieve-form{
+ padding:24px 40px 0px 40px;
+ }
+
diff --git a/src/achieveRequirement/achieve/achieveList/index.jsx b/src/achieveRequirement/achieve/achieveList/index.jsx
new file mode 100644
index 00000000..ab8d7db7
--- /dev/null
+++ b/src/achieveRequirement/achieve/achieveList/index.jsx
@@ -0,0 +1,148 @@
+import React, { useEffect, useState } from 'react';
+import classNames from 'classnames';
+import { Pagination, Button, Icon } from 'antd';
+import ChooseNav from '../../components/chooseNav';
+import ItemList from '../../components/itemList';
+import { getDictionary, getAchieveList } from '../api';
+
+export default (props) => {
+ const { current_user } = props;
+ // console.log(current_user);
+
+ const [achievementTypeId, setAchievementTypeId] = useState(''); //成果类别
+ const [achievementFileTypes, setAchievementFileTypes] = useState(''); //文件类型
+ const [orderBy, setOrderBy] = useState('-1');
+ const [curPage, setCurPage] = useState(1);
+ const [total, setTotal] = useState(0);
+ const [industryOption, setIndustryOption] = useState([]);
+ const [achiveList, setAchiveList] = useState([]);
+
+ useEffect(() => {
+ getDictionary('share_type').then(res => {
+ if (res && res.data) setIndustryOption(res.data);
+ });
+ }, []);
+
+ useEffect(() => {
+ const params = {
+ achievementTypeId,
+ achievementFileTypes,
+ achievementLabel: '',
+ isOwned: '',
+ orderBy,
+ curPage,
+ pageSize: 10
+ };
+ getAchieveList(params).then(data => {
+ setAchiveList(data.rows);
+ setTotal(data.total);
+ })
+ }, [achievementTypeId, achievementFileTypes, orderBy, curPage]);
+
+
+ function changeOptionId(option, type) {
+ if (type === 'share_type') {
+ setAchievementTypeId(option.id);
+ setCurPage(1);
+ } else if (type === 'file_type') {
+ setAchievementFileTypes(option.id);
+ setCurPage(1);
+ }
+ }
+
+ function changeSort(sortType) {
+ setOrderBy(sortType);
+ setCurPage(1);
+ }
+
+ function goAchieveMine() {
+ props.history.push('/achieve/achieveMine');
+ }
+ function goAdd() {
+ props.history.push("/achieve/achieveAdd");
+ }
+
+ function achiveClick(id) {
+ props.history.push(`/achieve/achieveDetail/${id}`);
+ }
+
+ const filetypeOption = [
+ {
+ dicItemName: '文件',
+ id: 1
+ },
+ {
+ dicItemName: '视频',
+ id: 2
+ },
+ {
+ dicItemName: '图片',
+ id: 3
+ },
+ {
+ dicItemName: '软件',
+ id: 4
+ },
+ {
+ dicItemName: '其它',
+ id: 5
+ },
+ ];
+
+
+ return (
+
+
+
+
+
+
+
+ {id ? '修改' : '新增'}成果
+
+
+ )
+}
\ No newline at end of file
diff --git a/src/achieveRequirement/achieve/achieveMine/index.jsx b/src/achieveRequirement/achieve/achieveMine/index.jsx
new file mode 100644
index 00000000..7bd9c37e
--- /dev/null
+++ b/src/achieveRequirement/achieve/achieveMine/index.jsx
@@ -0,0 +1,82 @@
+import React, { useEffect, useState } from 'react';
+import { Pagination } from 'antd';
+import ItemList from '../../components/itemList';
+import DelModal from '../../components/DelModal';
+import { deleteAchieve, getAchieveList } from '../api';
+
+export default (props) => {
+ const [achiveList, setAchiveList] = useState([]);
+ const [curPage, setCurPage] = useState(1);
+ const [total, setTotal] = useState(0);
+
+ useEffect(() => {
+ getAcheiveListOwn();
+ }, [curPage]);
+
+ function getAcheiveListOwn() {
+ const params = {
+ achievementTypeId: '',
+ achievementFileTypes: '',
+ achievementLabel: '',
+ // isOwned: '', //方便游客身份时显示数据
+ isOwned: true,
+ orderBy: -1,
+ curPage,
+ pageSize: 10
+ };
+ getAchieveList(params).then(data => {
+ setAchiveList(data.rows);
+ setTotal(data.total);
+ })
+ }
+
+ function achiveClick(id) {
+ props.history.push(`/achieve/achieveDetail/${id}`);
+ }
+
+ function editItem(id) {
+ props.history.push(`/achieve/achieveEdit/${id}`);
+ }
+
+ function deletItem(id) {
+ DelModal(() => {
+ deleteAchieve(id).then(res => {
+ if (res.code === '1') {
+ props.showNotification("删除成功");
+ getAcheiveListOwn();
+ } else {
+ props.showNotification("删除失败");
+ }
+ })
+ });
+ }
+
+ return (
+
+
+
+
+
+
+
+
+
+
+
+ {
+ // current_user.login &&
+ { changeSort('-1') }}>默认
+ { changeSort('created_at') }}>
+ { changeSort('view_count') }}>
+
+
+
+
+ }
+
+ { setCurPage(page) }}
+ current={curPage}
+ total={total}
+ showTotal={total => `共 ${total} 条`}
+ />
+
+
+
+
+ )
+}
\ No newline at end of file
diff --git a/src/achieveRequirement/achieve/api.js b/src/achieveRequirement/achieve/api.js
new file mode 100644
index 00000000..d5a69ada
--- /dev/null
+++ b/src/achieveRequirement/achieve/api.js
@@ -0,0 +1,62 @@
+import fetch from '../../fetch';
+
+// 获取字典分类列表
+export function getDictionary(id) {
+ return fetch({
+ url: '/dicItem/getData?dicTypeCode=' + id,
+ method: 'get'
+ });
+}
+
+// 成果列表查询
+export async function getAchieveList(params) {
+ let res = await fetch({
+ url: '/api/achievement/',
+ method: 'get',
+ params,
+ })
+ if (res && res.data) {
+ for (const i of res.data.rows) {
+ // 处理分解标签
+ i.tag = i.achievementLabel.split(',');
+ }
+ }
+ return res.data;
+}
+
+//新增成果
+export function addAchieve(data) {
+ return fetch({
+ url: '/api/achievement/',
+ method: 'post',
+ data: data
+ });
+}
+
+//删除成果
+export function deleteAchieve(id) {
+ return fetch({
+ url: '/api/achievement/' + id,
+ method: 'DELETE',
+ });
+}
+
+//更新成果
+export function editAchieve(data) {
+ return fetch({
+ url: '/api/achievement/',
+ method: 'put',
+ data: data
+ });
+}
+
+// 成果详情查询
+export async function getAchieveDetail(id) {
+ let res = await fetch({
+ url: '/api/achievement/' + id,
+ method: 'get',
+ });
+ res.data.achievementLabel = res.data.achievementLabel.split(',');
+ return res.data;
+}
+
diff --git a/src/achieveRequirement/components/DelModal.jsx b/src/achieveRequirement/components/DelModal.jsx
new file mode 100644
index 00000000..b2ba4434
--- /dev/null
+++ b/src/achieveRequirement/components/DelModal.jsx
@@ -0,0 +1,20 @@
+import { Modal } from 'antd';
+
+export default (
+ handleOk,
+ title,
+ content,
+ handleCancel) => {
+ return Modal.confirm({
+ title: title || "警告",
+ content: content || "确认删除？",
+ okText: '确定',
+ cancelText: '取消',
+ onOk() {
+ handleOk && handleOk();
+ },
+ onCancel() {
+ handleCancel && handleCancel();
+ }
+ });
+}
\ No newline at end of file
diff --git a/src/achieveRequirement/components/Upload.jsx b/src/achieveRequirement/components/Upload.jsx
new file mode 100644
index 00000000..1bcf218d
--- /dev/null
+++ b/src/achieveRequirement/components/Upload.jsx
@@ -0,0 +1,97 @@
+import React, { useEffect, useState } from "react";
+import { Upload, Button } from 'antd';
+import axios from 'axios';
+import { appendFileSizeToUploadFileAll } from 'educoder';
+axios.defaults.withCredentials = true;
+
+function Uploads({ className, size, actionUrl, fileList, showNotification, load }) {
+ 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);
+ // fileIdList(nf);
+ load && load(nf);
+
+ // 发送服务到后台删除文件，同步更新数据
+ // const url = actionUrl + `/busiAttachments/${id}`;
+ // axios.delete(url).then((response) => {
+ // if (response.data) {
+ // if (response.data.code === "1") {
+ // let nf = files.filter(item => (item.response.data.id !== id) && (item.id !== id));
+ // setFiles(nf);
+ // fileIdList(nf);
+ // } else {
+ // showNotification(response.data.message);
+ // }
+ // }
+ // }).catch(function (error) {
+ // console.log(error);
+ // });
+ }
+
+
+ function handleChange(info) {
+ if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
+ let fileList = info.fileList;
+ setFiles(appendFileSizeToUploadFileAll(fileList));
+ if (info.file.status === 'done' || info.file.status === 'removed') load && load(fileList);
+ }
+ }
+
+ // function fileIdList(fileList) {
+ // let id = [];
+ // let fileType = [];
+ // for (const item of fileList) {
+ // id.push(item.id || item.response.data.id);
+ // fileType.push(item.fileType || item.response.data.fileType);
+ // }
+ // load && load(id.join(), fileType.join());
+ // }
+
+ function beforeUpload(file) {
+ const isLt100M = file.size / 1024 / 1024 < size;
+ if (!isLt100M) {
+ showNotification(`文件大小必须小于${size}MB!`);
+ }
+ return isLt100M;
+ }
+
+ const upload = {
+ name: 'file',
+ fileList: files,
+ action: actionUrl + `/busiAttachments/upload`,
+ onChange: handleChange,
+ onRemove: onAttachmentRemove,
+ beforeUpload: beforeUpload,
+ };
+ return (
+
+
+
+
+
+
+
+ 我的成果
+
+
+ { setCurPage(page) }}
+ current={curPage}
+ total={total}
+ showTotal={total => `共 ${total} 条`}
+ />
+
+
+
+
+ )
+}
\ No newline at end of file
diff --git a/src/achieveRequirement/components/chooseNav/index.scss b/src/achieveRequirement/components/chooseNav/index.scss
new file mode 100644
index 00000000..069eba3f
--- /dev/null
+++ b/src/achieveRequirement/components/chooseNav/index.scss
@@ -0,0 +1,41 @@
+.nav-content {
+ margin-top:20px;
+ background: #fff;
+ border-bottom: 1px solid #eaeaea;
+ box-shadow: #ddd 0px 0px 5px;
+}
+.shop-box {
+ width: 1280px;
+ border-top: 1px solid #eaeaea;
+ display: flex;
+ justify-content: start;
+}
+.choose-title {
+ width: 110px;
+ background: #f3f3f3;
+ text-align: center;
+ padding: 16px 0;
+ font-size: 14px;
+ color: #666;
+ font-weight: 600;
+}
+.choose-list {
+ width: 1170px;
+ padding: 16px 0;
+ display: flex;
+ justify-content: start;
+}
+.choose-item {
+ font-size: 14px;
+ text-align: center;
+ padding: 0 15px ;
+ cursor: pointer;
+ &:hover{
+ color: #0072ff;
+ }
+}
+
+.choose-item-checked {
+ color: #0072ff;
+}
+
diff --git a/src/achieveRequirement/components/itemList/index.jsx b/src/achieveRequirement/components/itemList/index.jsx
new file mode 100644
index 00000000..7159cd00
--- /dev/null
+++ b/src/achieveRequirement/components/itemList/index.jsx
@@ -0,0 +1,42 @@
+import React from 'react';
+import './index.scss';
+const statusArr = ['待审核', '进行中', '成果验收中', '完成', '审核未通过', '延期', '其他', '验收未通过'];
+const classArr = ['', 'list-done', 'list-done', 'list-done', 'list-error', '', '', 'list-error'];
+
+export default (props) => {
+ const { list, itemClick, editItem, deletItem, activeByStatus } = props;
+
+ return (
+ list.map(item => {
+ return (
+ {title}
+
+
+ { setOption({ id: "", dicItemName: "" }) }}>全部
+ {
+ options.map((item) => {
+ return { setOption(item) }} >{item.dicItemName}
+ })
+ }
+
+
+ )
+ })
+ )
+}
\ No newline at end of file
diff --git a/src/achieveRequirement/components/itemList/index.scss b/src/achieveRequirement/components/itemList/index.scss
new file mode 100644
index 00000000..c4739395
--- /dev/null
+++ b/src/achieveRequirement/components/itemList/index.scss
@@ -0,0 +1,70 @@
+.list-box {
+ position: relative;
+ padding: 20px;
+ background: #fff;
+ border-bottom: 1px solid #dedede;
+}
+.list-title {
+ font-size: 17px;
+ color: #000;
+ cursor: pointer;
+}
+.list-title:hover {
+ color: #409eff;
+}
+.list-title span {
+ padding: 3px 5px;
+ margin-left:.5em;
+ background: #f8c753;
+ font-size: 13px;
+ color: #fff;
+ border-radius: 3px;
+}
+span.list-done {
+ background: #35d77e;
+}
+span.list-error {
+ background: #f56c6c;
+}
+
+.list-tag {
+ display: inline-block;
+ margin: 5px 10px 5px 0;
+ background: #cfe9ff;
+ color: #0089ff;
+ font-size: 14px;
+ border-radius: 3px;
+ padding: 2px 5px;
+}
+.list-other > p {
+ display: inline-block;
+ margin: 0 10px 0 0;
+ font-size: 12px;
+ color: #666;
+}
+
+.list-box-action {
+ position: absolute;
+ display: flex;
+ align-items: center;
+ top: 0;
+ bottom: 0;
+ right: 100px;
+ visibility: hidden;
+}
+.list-box:hover .list-box-action {
+ visibility: visible;
+}
+.list-box-action button {
+ display: inline-block;
+ margin: 0 25px;
+ width: 50px;
+ height: 50px;
+ color: #0089ff;
+ line-height: 50px;
+ text-align: center;
+ border: 0;
+ border-radius: 25px;
+ box-shadow: 2px 2px 5px 2px #eee;
+ cursor: pointer;
+}
diff --git a/src/achieveRequirement/index.scss b/src/achieveRequirement/index.scss
new file mode 100644
index 00000000..aece19b5
--- /dev/null
+++ b/src/achieveRequirement/index.scss
@@ -0,0 +1,100 @@
+// 本模块公共样式
+
+.centerbox {
+ width: 80vw;
+ max-width: 1280px;
+ margin: 40px auto;
+}
+.center-content {
+ margin: 20px 0;
+ background: #fff;
+ border: 1px solid #dedede;
+ box-shadow: #eee 0px 1px 1px 3px;
+}
+.centerScreen {
+ display: flex;
+ justify-content: space-between;
+ height: 46px;
+ background-color: #fff;
+ border-bottom: 1px solid #dedede;
+}
+
+// 内容标题左侧样式
+.center-left-but {
+ display: flex;
+ justify-content: start;
+ align-items: center;
+ margin-left: 20px;
+ font-size: 16px;
+ font-weight: 600;
+}
+.center-left-butD {
+ height: 24px;
+ font-size: 14px;
+ font-weight: 500;
+ line-height: 24px;
+ color: #333;
+ padding: 0 10px;
+ background-color: #fff;
+ border: 1px solid #dedede;
+}
+.center-left-butD:hover {
+ background-color: #fff;
+ color: #409eff;
+ cursor: pointer;
+}
+.center-left-butDACT {
+ background-color: #409eff;
+ color: #fff;
+}
+
+// 内容标题右侧样式
+.center-right-but {
+ display: flex;
+ align-items: center;
+}
+.center-right-but > span {
+ margin: 0 10px;
+ font-size: 16px;
+ color: #0089ff;
+ cursor: pointer;
+}
+
+// 通用标签样式
+.list-tag {
+ display: inline-block;
+ margin-right: 10px;
+ background: #cfe9ff;
+ color: #0089ff;
+ font-size: 14px;
+ border-radius: 3px;
+ padding: 2px 5px;
+ line-height: 25px;
+}
+
+// 文件预览modal样式
+.file-modal {
+ width: 800px !important;
+ .ant-modal-body {
+ padding-top: 40px;
+ .pdf-box {
+ height: 70vh;
+ overflow-y: scroll;
+ }
+ }
+ .ant-modal-close {
+ top: 0 !important;
+ }
+ .show-img {
+ width: 100%;
+ }
+ .react-pdf__Page__canvas,
+ .react-pdf__Page__textContent {
+ margin: 0 auto;
+ max-width: 100%;
+ }
+}
+
+.edit-input {
+ max-width: 500px;
+}
diff --git a/src/achieveRequirement/requirement.js b/src/achieveRequirement/requirement.js
new file mode 100644
index 00000000..0439051c
--- /dev/null
+++ b/src/achieveRequirement/requirement.js
@@ -0,0 +1,95 @@
+import React, { Component } from "react";
+
+import { Route, Switch } from "react-router-dom";
+import { withRouter } from "react-router";
+import { SnackbarHOC } from "educoder";
+import { CNotificationHOC } from "../modules/courses/common/CNotificationHOC";
+import { TPMIndexHOC } from "../modules/tpm/TPMIndexHOC";
+import Loadable from "react-loadable";
+import Loading from "../Loading";
+import { ImageLayerOfCommentHOC } from "../modules/page/layers/ImageLayerOfCommentHOC";
+import './index.scss';
+
+const RequireList = Loadable({
+ loader: () => import("./requirement/requireList"),
+ loading: Loading,
+});
+
+const RequireDetail = Loadable({
+ loader: () => import("./requirement/requireDetail"),
+ loading: Loading,
+});
+
+const RequireMine = Loadable({
+ loader: () => import("./requirement/requireMine"),
+ loading: Loading,
+});
+const RequireAdd = Loadable({
+ loader: () => import("./requirement/requireEdit"),
+ loading: Loading,
+});
+const RequireEdit = Loadable({
+ loader: () => import("./requirement/requireEdit"),
+ loading: Loading,
+});
+
+class Index extends Component {
+ render() {
+ return (
+ { itemClick(item.id) }}>
+ {item.achievementName || item.title}
+ {item.status && {statusArr[item.status]}}
+
+
+ {
+ item.tag.map(i => {
+ return {i};
+ })
+ }
+
+
+ {item.user &&
+ {
+ editItem && 发布者：{item.user.nickname ? item.user.nickname : item.user.login}
} + {item.createUser &&发布者：{item.createUser.nickname ? item.createUser.nickname : item.createUser.login}
} +发布时间：{item.achievementPublishTime || item.createTime}
+
+ {
+ !activeByStatus || (activeByStatus && item.status == '0' || item.status == '4' || item.status == '5') &&
+
+ }
+
+
+ }
+
+
+
+ (
+
+ (
+
+ (
+
+ (
+
+ (
+
+
+
+
+ {/* (
+ this.props.current_user && this.props.current_user.login ?
+ */}
+
+
+ );
+ }
+}
+export default withRouter(
+ ImageLayerOfCommentHOC({
+ imgSelector: ".imageLayerParent img, .imageLayerParent .imageTarget",
+ parentSelector: ".newMain",
+ })(CNotificationHOC()(SnackbarHOC()(TPMIndexHOC(Index))))
+);
diff --git a/src/achieveRequirement/requirement/api.js b/src/achieveRequirement/requirement/api.js
new file mode 100644
index 00000000..1ce9368a
--- /dev/null
+++ b/src/achieveRequirement/requirement/api.js
@@ -0,0 +1,71 @@
+import fetch from '../../fetch';
+
+// 获取字典分类列表
+export function getDictionary(id) {
+ return fetch({
+ url: '/dicItem/getData?dicTypeCode=' + id,
+ method: 'get'
+ });
+}
+
+// 需求列表查询
+export async function getRequirementList(data) {
+ let res = await fetch({
+ url: '/requirement/page',
+ method: 'post',
+ data,
+ });
+ if (res && res.data && res.data.rows) {
+ for (const i of res.data.rows) {
+ // 处理分解标签
+ i.tag = i.tag.split(',');
+ }
+ }
+ return res.data;
+}
+
+//新增需求
+export function addRequirement(data) {
+ return fetch({
+ url: '/requirement/add',
+ method: 'post',
+ data: data
+ });
+}
+
+//删除需求
+export function deleteRequirement(id) {
+ return fetch({
+ url: '/requirement/delete?id=' + id,
+ method: 'DELETE',
+ });
+}
+
+//更新需求
+export function updateRequirement(data) {
+ return fetch({
+ url: '/requirement/update',
+ method: 'put',
+ data: data
+ });
+}
+
+// 需求详情查询
+export async function getRequirementDetail(id) {
+ let res = await fetch({
+ url: '/requirement/getInfo?id=' + id,
+ method: 'get',
+ });
+ if (res && res.data) {
+ res.data.tag = res.data.tag.split(',');
+ return res.data;
+ }
+}
+
+//获取用户列表
+export function getAllUsers() {
+ return fetch({
+ url: '/user/getUsers',
+ method: 'get'
+ });
+}
\ No newline at end of file
diff --git a/src/achieveRequirement/requirement/requireDetail/index.jsx b/src/achieveRequirement/requirement/requireDetail/index.jsx
new file mode 100644
index 00000000..6e25dd9f
--- /dev/null
+++ b/src/achieveRequirement/requirement/requireDetail/index.jsx
@@ -0,0 +1,217 @@
+import React, { useEffect, useState } from 'react';
+import { Descriptions, Modal, Button } from 'antd';
+import { Document, Page, pdfjs } from 'react-pdf';
+import DelModal from '../../components/DelModal';
+import Upload from '../../components/Upload';
+import { httpUrl } from '../../../fetch';
+import { deleteRequirement, getRequirementDetail, updateRequirement } from '../api';
+import './index.scss';
+
+pdfjs.GlobalWorkerOptions.workerSrc = `//cdnjs.cloudflare.com/ajax/libs/pdf.js/${pdfjs.version}/pdf.worker.js`;
+
+export default ({ match, history, current_user, showNotification }) => {
+ const id = match.params.requireId;
+ const [requireForm, setRequireForm] = useState({});
+ const [visible, setVisible] = useState(false);
+ const [visibleAchieve, setVisibleAchieve] = useState(false);
+ const [fileType, setFileType] = useState(4);
+ const [fileUrl, setFileUrl] = useState(4);
+ const [numPages, setNumPages] = useState(null);
+ const [fileList, setFileList] = useState(null);
+ const [edit, setEdit] = useState(false);
+
+
+ useEffect(() => {
+ getRequirementDetail(id).then(data => {
+ if (data) {
+ setRequireForm(data);
+ if (data.achievementList) {
+ for (const item of data.achievementList) {
+ item.name = item.fileName;
+ item.size = item.fileSize;
+ item.uid = "rc-upload" + item.id
+ }
+ setFileList(data.achievementList);
+ }
+ }
+ });
+ }, [id, edit]);
+
+ function editItem() {
+ history.push(`/requirement/requireEdit/${id}`);
+ }
+
+ function deletItem() {
+ DelModal(() => {
+ deleteRequirement(id).then(res => {
+ if (res.code === '1') {
+ showNotification("删除成功");
+ history.go(-1);
+ } else {
+ showNotification("删除失败");
+ }
+ })
+ });
+ }
+
+ function downFile(item) {
+ let url = httpUrl + '/busiAttachments/download/' + item.id;
+ window.open(url);
+ }
+
+ function pdfShow(e) {
+ setFileType(e.fileType);
+ if (e.fileType === 1 || e.fileType === 2 || e.fileType === 3) {
+ // pdf||video||img
+ setVisible(true);
+ setFileUrl(httpUrl + '/busiAttachments/view/' + e.id);
+ }
+ }
+
+ function onDocumentLoadSuccess({ numPages }) {
+ setNumPages(numPages);
+ }
+
+ // 上传附件后得到的文件数组
+ function UploadFunc(fileList) {
+ setFileList(fileList);
+ }
+
+ function uploadAchievement() {
+ let files = [];
+ let filestype = [];
+ for (const item of fileList) {
+ files.push(item.id || item.response.data.id);
+ filestype.push(item.fileType || item.response.data.fileType);
+ }
+ let data = {
+ id,
+ achievements: files.toString(),
+ // createUserAccount: sessionStorage.getItem('SET_Account'),//用户信息
+ // createUserName: sessionStorage.getItem('SET_NAME'),
+ status: "2"
+ }
+ updateRequirement(data).then(res => {
+ if (res.code === '1') {
+ showNotification('更新成果文件成功!');
+ setEdit(!edit);
+ setVisibleAchieve(false);
+ }
+ })
+ }
+
+ return (
+
+ { setVisible(false) }}
+ className="file-modal"
+ >
+ {
+ fileType === 3 &&
+
+ { setVisibleAchieve(false) }}
+ onOk={uploadAchievement}
+ className="upload-modal"
+ >
+
+
+
+ )
+}
diff --git a/src/achieveRequirement/requirement/requireDetail/index.scss b/src/achieveRequirement/requirement/requireDetail/index.scss
new file mode 100644
index 00000000..d0a621e0
--- /dev/null
+++ b/src/achieveRequirement/requirement/requireDetail/index.scss
@@ -0,0 +1,40 @@
+// 内容详情
+.item-content {
+ padding: 10px 10px 0 30px;
+}
+.ant-descriptions-item-label {
+ width: 5em;
+ margin-right: 5px;
+ color: rgba(0, 0, 0, 0.65);
+ text-align: right;
+}
+.ant-descriptions-item-content {
+ color: rgba(0, 0, 0, 1);
+}
+.file-list-item > span {
+ vertical-align: top;
+}
+.file-list-box {
+ width: 600px;
+ height: 60px;
+ display: flex;
+ justify-content: space-between;
+ p:hover {
+ cursor: pointer;
+ color: #0089ff;
+ }
+ .downP {
+ color: #0089ff;
+ cursor: pointer;
+ text-decoration: none;
+ }
+}
+
+.upload-modal{
+ width: 800px !important;
+ .commentStyle{
+ display: inline-block;
+ width: 100%;
+ }
+}
+
diff --git a/src/achieveRequirement/requirement/requireEdit/index.jsx b/src/achieveRequirement/requirement/requireEdit/index.jsx
new file mode 100644
index 00000000..2175d223
--- /dev/null
+++ b/src/achieveRequirement/requirement/requireEdit/index.jsx
@@ -0,0 +1,247 @@
+import React, { forwardRef, useCallback, useEffect, useState } from 'react';
+import { Form, Input, Select, Button, DatePicker } from 'antd';
+import moment from 'moment';
+import Upload from '../../components/Upload';
+import { httpUrl } from '../../../fetch';
+import { getDictionary, getRequirementDetail, addRequirement, updateRequirement } from '../api';
+import './index.scss';
+
+const Option = Select.Option;
+const { TextArea } = Input;
+const format = "YYYY-MM-DD HH:mm:ss";
+
+export default Form.create()(forwardRef(({current_user, form, showNotification, match, history }, ref) => {
+
+ const [requireType, setRequireType] = useState([]);
+ const [tagType, setTagType] = useState([]);
+ const [fileList, setFileList] = useState(null);
+ const [typeCode, setTypeCode] = useState('');
+ const [typeName, setTypeName] = useState('');
+
+ const id = match.params.requireId;
+ const { getFieldDecorator, validateFields, setFieldsValue, } = form;
+
+ useEffect(() => {
+ id && getRequirementDetail(id).then(data => {
+ const formValue = {
+ title: data.title,
+ attachments: data.attachments,
+ // typeCode: data.typeCode, //为使用select labelInValue，在代码中初始化值
+ endTime: moment(data.endTime),
+ tag: data.tag,
+ remark: data.remark
+ };
+ setFieldsValue(formValue);
+ setTypeName(data.typeName);
+ setTypeCode(data.typeCode)
+ if (data.attachmentList.length) {
+ for (const item of data.attachmentList) {
+ item.name = item.fileName;
+ item.size = item.fileSize;
+ item.uid = "rc-upload" + item.id
+ }
+ setFileList(data.attachmentList);
+ }
+ })
+ }, [id]);
+
+ // 加载选项数据
+ useEffect(() => {
+ getDictionary('requirement_type').then((res) => {
+ setRequireType(res.data);
+ });
+ getDictionary("tag_type").then((res) => {
+ setTagType(res.data);
+ });
+ }, []);
+
+
+ // 上传附件后得到的文件数组
+ function UploadFunc(fileList) {
+ setFileList(fileList);
+ let files = [];
+ for (const item of fileList) {
+ files.push(item.id || item.response.data.id);
+ }
+ setFieldsValue({
+ attachments: files.join()
+ });
+ }
+
+ const helper = useCallback(
+ (label, name, rules, widget, initialValue) => (
+
+
+ {requireForm.typeName}
+
+ {
+ requireForm.tag && requireForm.tag.map(itemx => {
+ return {itemx}
+ })
+ }
+
+ {requireForm.assignedUserName}
+ {requireForm.endTime}
+ {requireForm.remark}
+
+ {
+ requireForm.attachmentList && requireForm.attachmentList.map(item => {
+ return
+
+
+
+
+
+
+ {requireForm.title}
+ {
+
+ {
+ // (role||operator||needsForm.assignedUserLogin==userid||needsForm.createUserAccount==userid)&&(needsForm.status==1||needsForm.status==2||needsForm.status==7||needsForm.status==5)
+ ((current_user.admin || current_user.operator || requireForm.assignedUserLogin == current_user.login || requireForm.createUserAccount == current_user.login)
+ && (requireForm.status == 1 || requireForm.status == 2 || requireForm.status == 7 || requireForm.status == 5)) &&
+
+ }
+
+ {
+ requireForm.createUserAccount === current_user.login &&
+
+ 编辑
+ 删除
+
+ }
+
+ }
+
+
+
+ })
+ }
+ { pdfShow(item) }}>{item.fileName}
+ { downFile(item) }}>下载 +
+
+
+ }
+ {
+ fileType === 2 &&
+
+
+ }
+ {
+ fileType === 1 &&
+ {
+
+ {new Array(numPages).fill("").map((item, index) => {
+ return (
+
+ }
+
+ }
+
+
+ )
+})
+)
diff --git a/src/achieveRequirement/requirement/requireEdit/index.scss b/src/achieveRequirement/requirement/requireEdit/index.scss
new file mode 100644
index 00000000..ad5c9622
--- /dev/null
+++ b/src/achieveRequirement/requirement/requireEdit/index.scss
@@ -0,0 +1,4 @@
+ .achieve-form{
+ padding:24px 40px 0px 40px;
+ }
+
diff --git a/src/achieveRequirement/requirement/requireList/index.jsx b/src/achieveRequirement/requirement/requireList/index.jsx
new file mode 100644
index 00000000..ec7f7c1d
--- /dev/null
+++ b/src/achieveRequirement/requirement/requireList/index.jsx
@@ -0,0 +1,117 @@
+import React, { useEffect, useState } from 'react';
+import { Pagination, Button } from 'antd';
+import ChooseNav from '../../components/chooseNav';
+import ItemList from '../../components/itemList';
+import { getDictionary, getRequirementList } from '../api';
+
+export default (props) => {
+ const { current_user } = props;
+ // console.log(current_user);
+
+ const [requirementType, setrequirementType] = useState([]); //需求类别选项数组
+ const [requirementStatusArr, setrequirementStatusArr] = useState([]); //需求状态选项数组
+ const [requirementTypeName, setRequirementTypeName] = useState(''); //当前需求类别
+ const [requirementStatus, setRequirementStatus] = useState(''); //当前需求状态
+ const [curPage, setCurPage] = useState(1);
+ const [total, setTotal] = useState(0);
+ const [requirementList, setRequirementList] = useState([]);
+
+ useEffect(() => {
+ getDictionary('requirement_type').then(res => {
+ if (res && res.data) setrequirementType(res.data);
+ });
+ getDictionary('requirement_status').then(res => {
+ if (res && res.data) setrequirementStatusArr(res.data);
+ });
+ }, []);
+
+ useEffect(() => {
+ const params = {
+ tag: null,
+ status: requirementStatus || null,
+ typeName: requirementTypeName || null,
+ queryType: 'all',
+ curPage,
+ pageSize: 10
+ };
+ getRequirementList(params).then(data => {
+ if (data && data.rows) {
+ setRequirementList(data.rows);
+ setTotal(data.total);
+ }
+ })
+ }, [requirementTypeName, requirementStatus, curPage]);
+
+ function changeOptionId(option, type) {
+ if (type === 'requirement_type') {
+ setRequirementTypeName(option.dicItemName);
+ setCurPage(1);
+ } else if (type === 'requirement_status') {
+ setRequirementStatus(option.dicItemCode);
+ setCurPage(1);
+ }
+ }
+
+ function goRequirementMine() {
+ props.history.push('/requirement/requireMine');
+ }
+ function goAdd() {
+ props.history.push("/requirement/requireAdd");
+ }
+
+ function achiveClick(id) {
+ props.history.push(`/requirement/requireDetail/${id}`);
+ }
+
+ return (
+
+
+
+
+
+
+ {id ? '修改' : '新增'}需求
+
+
+ )
+}
\ No newline at end of file
diff --git a/src/achieveRequirement/requirement/requireMine/allRequire.jsx b/src/achieveRequirement/requirement/requireMine/allRequire.jsx
new file mode 100644
index 00000000..ca67ad2d
--- /dev/null
+++ b/src/achieveRequirement/requirement/requireMine/allRequire.jsx
@@ -0,0 +1,333 @@
+import React, { useEffect, forwardRef, useCallback, useState } from 'react';
+import classnames from 'classnames';
+import { Form, Radio, Input, Select, Pagination, Table, Button, Modal } from 'antd';
+import DelModal from '../../components/DelModal';
+import { deleteRequirement, getRequirementList, getAllUsers, updateRequirement } from '../api';
+
+const Option = Select.Option;
+const { TextArea } = Input;
+
+const statusArr = ['待审核', '进行中', '成果验收中', '完成', '审核未通过', '延期', '其他', '验收未通过'];
+const chooseStatusArr = ['待审核', '进行中', '成果验收中', '完成', '审核未通过', '延期', '全部'];
+const statusColor = ['#f8c753', '#67c23a', '#67c23a', '#67c23a', '#F56C6C', '#f8c753', '#f8c753', '#F56C6C'];
+
+export default Form.create()(forwardRef(({ form, showNotification, match, history }, ref) => {
+ const [requirementList, setRequirementList] = useState([]);
+ const [curPage, setCurPage] = useState(1);
+ const [total, setTotal] = useState(0);
+ const [status, setStatus] = useState(6);
+ const [checkVisible, setCheckVisible] = useState(false);
+ const [checkStatus, setCheckStatus] = useState(1);
+ const [acceptVisible, setAcceptVisible] = useState(false);
+ const [currentId, setCurrentId] = useState('');
+ const [allUsers, setAllUsers] = useState([]);
+
+
+ const { getFieldDecorator, validateFields, } = form;
+
+ useEffect(() => {
+ getRequireList();
+ }, [curPage, status]);
+
+ useEffect(() => {
+ if (checkVisible) {
+ getAllUsers().then(res => {
+ if (res.code === '1') {
+ setAllUsers(res.data);
+ } else {
+ showNotification(res.message);
+ }
+ })
+ }
+ }, [checkVisible]);
+
+ function getRequireList() {
+ let searchStaus = "";
+ if (status !== 6) {
+ searchStaus = status;
+ }
+ const params = {
+ curPage,
+ pageSize: 10,
+ status: searchStaus,
+ tag: "",
+ title: "",
+ typeName: "",
+ currentUser: "",
+ queryType: "all" //all:所有 my:我创建的 tome:指派给我的
+ };
+ getRequirementList(params).then(data => {
+ if (data) {
+ for (const item of data.rows) {
+ item.createUserName = item.createUser.nickname ? item.createUser.nickname : item.createUser.login;
+ }
+ setRequirementList(data.rows);
+ setTotal(data.total);
+ }
+ })
+ }
+
+ function detailItem(id) {
+ history.push(`/requirement/requireDetail/${id}`);
+ }
+
+ function editItem(id) {
+ history.push(`/requirement/requireEdit/${id}`);
+ }
+
+ function deletItem(id) {
+ DelModal(() => {
+ deleteRequirement(id).then(res => {
+ if (res.code === '1') {
+ showNotification("删除成功");
+ getRequireList();
+ } else {
+ showNotification("删除失败");
+ }
+ })
+ }, '此操作将删除该记录, 是否继续?');
+ }
+
+ // 审核
+ function checkItem() {
+ validateFields((error, values) => {
+ if (!error) {
+ let params = {
+ id: currentId,
+ status: checkStatus, //状态
+ assignedUserLogin: values.vertifyUserAccount ? values.vertifyUserAccount.key : '',
+ assignedUserName: values.vertifyUserAccount ? values.vertifyUserAccount.label : '',
+ vertifyUserAccount: values.vertifyUserAccount ? values.vertifyUserAccount.key : '',
+ vertifyUserName: values.vertifyUserAccount ? values.vertifyUserAccount.label : '',
+ vertifyComments: values.vertifyComments,
+ };
+ console.log(params);
+ updateRequirement(params).then(res => {
+ if (res.code === '1') {
+ showNotification("操作成功!");
+ setCheckVisible(false);
+ getRequireList();
+ } else {
+ showNotification(res.message);
+ }
+ });
+ }
+ })
+ }
+
+ // 验收
+ function acceptItem() {
+ validateFields((error, values) => {
+ if (!error) {
+ let params = {
+ status: values.status,
+ id: currentId,
+ checkComments: values.checkComments,
+ };
+ console.log(params);
+ updateRequirement(params).then(res => {
+ if (res.code === '1') {
+ showNotification("操作成功!");
+ setAcceptVisible(false);
+ getRequireList();
+ } else {
+ showNotification(res.message);
+ }
+ });
+ }
+ })
+ }
+
+ const columns = [
+ {
+ title: '需求标题',
+ dataIndex: 'title',
+ key: 'title',
+ width: '20%',
+ },
+ {
+ title: '类型',
+ dataIndex: 'typeName',
+ key: 'typeName',
+ },
+ {
+ title: '创建人',
+ dataIndex: 'createUserName',
+ key: 'createUserName',
+ },
+ {
+ title: '指派人',
+ key: 'assignedUserName',
+ dataIndex: 'assignedUserName',
+ },
+ {
+ title: '创建时间',
+ key: 'createTime',
+ dataIndex: 'createTime',
+ },
+ {
+ title: '结束时间',
+ key: 'endTime',
+ dataIndex: 'endTime',
+ },
+ {
+ title: '状态',
+ key: 'status',
+ dataIndex: 'status',
+ render: (text, record) => {
+ return {statusArr[text]}
+ }
+ },
+ {
+ title: '操作',
+ key: 'action',
+ render: (text, record) => (
+
+
+
+
+ {record.status === '0' && }
+ {record.status === '2' && }
+
+ ),
+ },
+ ];
+
+ const helper = useCallback(
+ (label, name, rules, widget, initialValue) => (
+
+
+
+
+
+
+
+
+
+ 需求大厅
+ {
+ current_user.login &&
+
+
+
+
+ }
+
+ { setCurPage(page) }}
+ current={curPage}
+ total={total}
+ showTotal={total => `共 ${total} 条`}
+ />
+
+
+
+ {
+ chooseStatusArr.map((item, i) => {
+ return
+ })
+ }
+
+
+