diff --git a/src/military/task/components/itemDelayManage/index.jsx b/src/military/task/components/itemDelayManage/index.jsx index 9b01bcf8..07914b3d 100644 --- a/src/military/task/components/itemDelayManage/index.jsx +++ b/src/military/task/components/itemDelayManage/index.jsx @@ -182,7 +182,7 @@ export default Form.create()((props) => { 发布方式: - {item.task && item.task.publishMode === 1 ? '统筹任务' : '自主提交'} + {item.publishMode === 1 ? '统筹任务' : '自主提交'} @@ -207,10 +207,6 @@ export default Form.create()((props) => { item.status === 6 && item.agreementSigning === 2 && item.contractStatus === 2 && '已上传委托协议' } - { - item.status === 6 && item.agreementSigning === 2 && item.contractStatus === 2 && '已上传协议签订凭证' - } - { item.status === 7 && item.agreementSigning === 2 && '未上传支付报酬凭证' } diff --git a/src/military/task/components/itemListMyTask/index.jsx b/src/military/task/components/itemListMyTask/index.jsx index 0f9e9451..8f594f7c 100644 --- a/src/military/task/components/itemListMyTask/index.jsx +++ b/src/military/task/components/itemListMyTask/index.jsx @@ -234,7 +234,7 @@ export default Form.create()((props) => { {item.status === 6 && item.agreementSigning === 0 && { signMethodModal(item) }}>选择协议签订方式} - {item.status === 6 && item.agreementSigning === 2 && item.contractStatus === null && { uploadAgree(item) }}>上传委托协议} + {item.status === 6 && item.agreementSigning === 2 && (item.contractStatus === null || item.contractStatus === 0) && { uploadAgree(item) }}>上传委托协议} {item.status === 6 && item.agreementSigning === 2 && [1, 2].includes(item.contractStatus) && 已上传委托协议} diff --git a/src/military/task/delayManage/index.js b/src/military/task/delayManage/index.js index f7e7ea4a..5f11fe1f 100644 --- a/src/military/task/delayManage/index.js +++ b/src/military/task/delayManage/index.js @@ -11,7 +11,7 @@ const { Search } = Input; export default ({ current_user, showNotification, history }) => { const [operationStatus, setOperationStatus] = useState(0); - const [publicMode, setPublicMode] = useState(''); + const [publishMode, setPublishMode] = useState(''); const [cancelStatus, setCancelStatus] = useState(''); const [loading, setLoading] = useState(false); @@ -30,7 +30,7 @@ export default ({ current_user, showNotification, history }) => { status, curPage, pageSize: 10, - publicMode, + publishMode, cancelStatus, }; setLoading(true); @@ -41,7 +41,7 @@ export default ({ current_user, showNotification, history }) => { } setLoading(false); }) - }, [reload,searchInput, operationStatus, publicMode, cancelStatus, status, curPage,]); + }, [reload,searchInput, operationStatus, publishMode, cancelStatus, status, curPage,]); const changeTaskStatus = useCallback((option) => { @@ -80,16 +80,16 @@ export default ({ current_user, showNotification, history }) => { maxLength={20} style={{ width: "300px" }} placeholder="请输入任务编号/任务名称关键字" - onSearch={(value) => setSearchInput(value)} + onSearch={(value) => {setSearchInput(value);setCurPage(1);}} />