驳回原因:
{item.content}
diff --git a/src/military/task/components/itemListPaper/index.jsx b/src/military/task/components/itemListPaper/index.jsx
index 0732a97ca..90134a1cb 100644
--- a/src/military/task/components/itemListPaper/index.jsx
+++ b/src/military/task/components/itemListPaper/index.jsx
@@ -24,7 +24,7 @@ for (const item of paperCheckStatusArr) {
}
export default Form.create()((props) => {
- const { list, curPage, total, changePage, loading, applyStatusAllNameArr, reloadList, showNotification, current_user, form, detailStatus, expertReview ,mygetHelmetapi} = props;
+ const { list, curPage, total, changePage, loading, applyStatusAllNameArr, reloadList, showNotification, current_user, form, detailStatus, expertReview ,mygetHelmetapi, taskLimit} = props;
const { getFieldDecorator, validateFields, setFieldsValue } = form;
const [page, setPage] = useState(1);
const pageSize = props.pageSize || 10;
@@ -146,17 +146,8 @@ export default Form.create()((props) => {
);
function certificationCheck(item) {
- if (current_user.bankCertification) {
- setAgreeVisible(true);
- setCheckedItem(item);
- } else {
- Modal.confirm({
- content: "签订协议前请先完成财务认证,是否前往认证?",
- onOk() {
- window.location.href=`${mygetHelmetapi && mygetHelmetapi.main_web_site_url}/users/${current_user.login}/profiles`;
- }
- })
- }
+ setAgreeVisible(true);
+ setCheckedItem(item);
}
return (
@@ -181,14 +172,13 @@ export default Form.create()((props) => {
{winReview && i ==0 &&
第一名}
{winReview && i ==1 &&
第二名}
{winReview && i ==2 &&
第三名}
+ {item.status === 2 && detailStatus === 6 && taskLimit &&
+
{certificationCheck(item); }}>签订协议}
{((item.needComplain && detailStatus === 3) || (detailStatus === 5 && item.publicTaskComplain && item.checkStatus === 1 && item.status !== 2)) && (current_user.login === item.user.login) &&
{ setComplainVisible(true); setCheckedItem(item) }}>申诉}
- {item.status === 2 && detailStatus === 6 && (current_user.login === item.user.login) && (!item.sign) && (item.canApplicantSign || item.canApplicantSignByPlatform) &&
- {certificationCheck(item); }}>签订协议}
-
{item.status === 2 && detailStatus === 7 && (current_user.login === item.user.login) && (item.task && item.task.agreementSigning === 1) && (!item.isPay) &&
{ confirmReceiptModal(item.id) }}>确认收款}
diff --git a/src/military/task/components/itemListPaper/index.scss b/src/military/task/components/itemListPaper/index.scss
index b1e9d7604..0b688e5a3 100644
--- a/src/military/task/components/itemListPaper/index.scss
+++ b/src/military/task/components/itemListPaper/index.scss
@@ -66,6 +66,21 @@
}
}
}
+.right-button {
+ width:81px;
+ height:34px;
+ border:1px solid;
+ border-color:#4154f1;
+ border-radius:2px;
+ color:#4154f1;
+ font-size:15px;
+ line-height: 34px;
+ text-align: center;
+ position: absolute;
+ right: 0;
+ top: 50%;
+ transform: translate(0, -50%);
+}
.fileComments{
.icon-dianzan_icon{
diff --git a/src/military/task/taskDetail/index.jsx b/src/military/task/taskDetail/index.jsx
index ed6b1491f..3e00ede19 100644
--- a/src/military/task/taskDetail/index.jsx
+++ b/src/military/task/taskDetail/index.jsx
@@ -65,7 +65,6 @@ export default Form.create()(
// !current_user.login&&showLoginDialog();
// },[current_user.login]);
- console.log(current_user);
// 获取任务领域配置数据
useEffect(() => {
@@ -569,6 +568,11 @@ export default Form.create()(
}
{(!current_user.login || (current_user.enterpriseCertification || current_user.authentication) && detailData.status === 3 && (!detailData.exceptClosedBoolean)) && signContent()}
+ {/* {
+
+ current_user.login && detailData.status === 6 &&
+ } */}
+
交稿
{/* 此功能暂时去掉 */}
@@ -609,6 +613,7 @@ export default Form.create()(
{
- console.log(current_user);
let initType = getUrlToken('type', location.search) || '';
let taskParams = sessionStorage.getItem("taskParams") ? JSON.parse(sessionStorage.getItem("taskParams")) : {};