diff --git a/src/military/task/components/itemProofManage/index.jsx b/src/military/task/components/itemProofManage/index.jsx
index 74255d811..4de3b8459 100644
--- a/src/military/task/components/itemProofManage/index.jsx
+++ b/src/military/task/components/itemProofManage/index.jsx
@@ -91,7 +91,7 @@ export default (props) => {
{
item.taskResultProof.status === 2 &&
- { goUserMes(item.user.login) }}>私信
+ { goUserMes(item.user.id) }}>私信
{ agreeClick(item) }}>同意
{ refuseClick(item) }}>拒绝
diff --git a/src/military/task/components/itemPublicityComplain/index.jsx b/src/military/task/components/itemPublicityComplain/index.jsx
index 08ad81bd4..4a176b575 100644
--- a/src/military/task/components/itemPublicityComplain/index.jsx
+++ b/src/military/task/components/itemPublicityComplain/index.jsx
@@ -78,7 +78,7 @@ export default Form.create()((props) => {
{ goUser(item.user.login) }}>{item.user && (item.user.nickname || item.user.login)}
{timeAgo(item.createdAt)}
- { goUserMes(item.user.login) }}>私信
+ { goUserMes(item.user.id) }}>私信
{item.status === 2 && { deal(item) }}>处理}
diff --git a/src/military/task/components/itemTaskManage/index.jsx b/src/military/task/components/itemTaskManage/index.jsx
index fc5601d66..74df438ee 100644
--- a/src/military/task/components/itemTaskManage/index.jsx
+++ b/src/military/task/components/itemTaskManage/index.jsx
@@ -95,7 +95,7 @@ export default (props) => {
{
item.status === 1 &&
- { goUserMes(item.user.login) }}>私信
+ { goUserMes(item.user.id) }}>私信
{ agreeClick(item.id) }}>同意
{ refuseClick(item.id) }}>拒绝
diff --git a/src/military/task/taskAdmin/index.jsx b/src/military/task/taskAdmin/index.jsx
index 8241c23a6..4829b6068 100644
--- a/src/military/task/taskAdmin/index.jsx
+++ b/src/military/task/taskAdmin/index.jsx
@@ -232,14 +232,14 @@ export default Form.create()(({ form, showNotification, match, history, state })
title: '评审规则',
dataIndex: 'ruleEditedCount',
render: (text, record) => {
- return record.assignRuleAndExperts ?
: record.expertReview && (record.status === 1 || record.status === 3) ?
编辑 :
编辑
+ return record.assignRuleAndExperts ?
: record.expertReview && (record.status === 1 || record.status === 3) ?
编辑 :
编辑
}
},
{
title: '专家选取',
dataIndex: 'expertSelectedCount',
render: (text, record) => {
- return record.assignRuleAndExperts ?
: record.expertReview && (record.status === 1 || record.status === 3) ?
选择 :
选择
+ return record.assignRuleAndExperts ?
: record.expertReview && (record.status === 1 || record.status === 3) ?
选择 :
选择
}
},
{
@@ -253,7 +253,7 @@ export default Form.create()(({ form, showNotification, match, history, state })
title: '评审结果',
dataIndex: 'expertReview2',
render: (text, record) => {
- return record.assignRuleAndExperts ?
查看:
查看
+ return record.assignRuleAndExperts ?
查看:
查看
}
},
{
diff --git a/src/military/task/taskAdminRouter.js b/src/military/task/taskAdminRouter.js
deleted file mode 100644
index e6badd65e..000000000
--- a/src/military/task/taskAdminRouter.js
+++ /dev/null
@@ -1,136 +0,0 @@
-import React from "react";
-
-import { Route, Switch } from "react-router-dom";
-import Loadable from "react-loadable";
-import Loading from "../../Loading";
-import AdminRouter from "../components/adminRouter";
-
-
-const TaskManage = Loadable({
- loader: () => import("./taskManage"),
- loading: Loading,
-});
-
-const PaperManage = Loadable({
- loader: () => import("./paperManage"),
- loading: Loading,
-});
-
-const PaperComplain = Loadable({
- loader: () => import("./paperComplain"),
- loading: Loading,
-});
-
-const ProofManage = Loadable({
- loader: () => import("./proofManage"),
- loading: Loading,
-});
-
-const PublicityComplain = Loadable({
- loader: () => import("./publicityComplain"),
- loading: Loading,
-});
-
-const AgreementManage = Loadable({
- loader: () => import("./agreementManage"),
- loading: Loading,
-});
-
-const PayProof = Loadable({
- loader: () => import("./payProof"),
- loading: Loading,
-});
-
-const TaskAdmin = Loadable({
- loader: () => import("./taskAdmin"),
- loading: Loading,
-});
-
-const DelayManage = Loadable({
- loader: () => import("./delayManage"),
- loading: Loading,
-});
-
-const AdminPage = (propsF) => {
-
- return (
-
-
-
- {/* 任务管理审核 */}
- (
-
- )}
- >
-
- {/* 成果管理审核 */}
- (
-
- )}
- >
-
- {/* 成果申诉管理审核 */}
- (
-
- )}
- >
-
- {/* 公示期成果申诉管理审核 */}
- (
-
- )}
- >
-
- {/* 佐证管理审核 */}
- (
-
- )}
- >
-
- {/* 管理员协议审核 */}
- (
-
- )}
- >
-
- {/* 管理员上传支付凭证 */}
- (
-
- )}
- >
-
- {/* 管理员任务列表 */}
- (
-
- )}
- >
-
- {/* 延期管理 */}
- (
-
- )}
- >
-
-
- );
-}
-// }
-export default AdminPage;