diff --git a/src/military/task/components/agreementModal/index.jsx b/src/military/task/components/agreementModal/index.jsx index afc1cd7c3..873a399c8 100644 --- a/src/military/task/components/agreementModal/index.jsx +++ b/src/military/task/components/agreementModal/index.jsx @@ -103,6 +103,7 @@ export default Form.create()(props => { size={50} showNotification={showNotification} fileList={fileList} + uploadUrl="/busiAttachments/taskOnlineSign/upload" /> {getFieldDecorator('files', { rules: [{ required: visible, message: "请上传文件" }], @@ -115,6 +116,7 @@ export default Form.create()(props => { size={50} showNotification={showNotification} fileList={fileList1} + uploadUrl="/busiAttachments/taskOnlineSign/upload" /> {getFieldDecorator('files1', { rules: [{ required: visible, message: "请上传文件" }], diff --git a/src/military/task/taskDetail/index.jsx b/src/military/task/taskDetail/index.jsx index 3e00ede19..2fecaac99 100644 --- a/src/military/task/taskDetail/index.jsx +++ b/src/military/task/taskDetail/index.jsx @@ -1,5 +1,5 @@ import React, { forwardRef, useEffect, useState, useCallback, useMemo } from 'react'; -import { Form, Input, Button, Modal, Checkbox, Tooltip } from 'antd'; +import { Form, Input, Button, Modal, Checkbox, Steps } from 'antd'; import classNames from 'classnames'; import moment from 'moment'; import { Link } from "react-router-dom"; @@ -16,6 +16,7 @@ import { httpUrl } from '../fetch'; import './index.scss'; import { getRules } from 'src/military/expert/api'; const { TextArea } = Input; +const { Step } = Steps; const taskModeNameArr = []; @@ -122,6 +123,21 @@ export default Form.create()( } }, [detailData, current_user]) + // 判断是否是胜出者 + const isWinner = useMemo(() => { + let isWin = false + for (const item of dataList) { + if (item.user.login === current_user.login) { + isWin = true + } + } + return isWin + },[dataList, current_user]) + + const signStep = (status) => { + return status === 0 ? 协议在线签字 : 协议在线签字,点击前往 + } + // 获取协议内容 useEffect(() => { applyModal && current_user.login && getAgreement(1).then(res => { @@ -568,10 +584,14 @@ 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 && - } */} + { + current_user.login && detailData.status === 6 && isWinner &&