From 00b41844bbb59061c4de89d58cb0f0212a3be90c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= <792998983@qq.com> Date: Tue, 10 Aug 2021 17:32:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=90=9C=E7=B4=A2=E5=9B=9E?= =?UTF-8?q?=E5=88=B0=E7=AC=AC=E4=B8=80=E9=A1=B5=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/components/itemDelayManage/index.jsx | 6 +----- .../task/components/itemListMyTask/index.jsx | 2 +- src/military/task/delayManage/index.js | 14 +++++++------- src/military/task/myTask/index.jsx | 4 ++-- src/military/task/myTask/joinTask.jsx | 2 +- src/military/task/taskList/index.jsx | 4 ++-- 6 files changed, 14 insertions(+), 18 deletions(-) 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);}} />
- - - + + +
{ diff --git a/src/military/task/myTask/index.jsx b/src/military/task/myTask/index.jsx index 46c6c493..98acaaa9 100644 --- a/src/military/task/myTask/index.jsx +++ b/src/military/task/myTask/index.jsx @@ -120,7 +120,7 @@ export default ({ location, history, current_user, showNotification }) => { maxLength={20} style={{ width: "300px" }} placeholder="请输入任务编号/任务名称关键字" - onSearch={(value) => setSearchInput(value)} + onSearch={(value) => { setSearchInput(value); setCurPage(1) }} /> } > @@ -150,7 +150,7 @@ export default ({ location, history, current_user, showNotification }) => { { - identity === '1' && statusType === '2' && { maxLength={20} style={{ width: "300px" }} placeholder="请输入任务编号/任务名称关键字" - onSearch={(value) => setSearchInput(value)} + onSearch={(value) => { setSearchInput(value); setCurPage(1); }} /> } > diff --git a/src/military/task/taskList/index.jsx b/src/military/task/taskList/index.jsx index 118ef2ba..02f93bae 100644 --- a/src/military/task/taskList/index.jsx +++ b/src/military/task/taskList/index.jsx @@ -105,7 +105,7 @@ export default ({ history, current_user, showLoginDialog }) => { surplus = item.payingDays * 24 * 3600 - (new Date() - new Date(item.signingCompleteAt)) / 1000; break; default: - surplus=0; + surplus = 0; } let surplusTimetext = formatDuring(surplus); @@ -220,7 +220,7 @@ export default ({ history, current_user, showLoginDialog }) => { maxLength={20} style={{ width: "300px" }} placeholder="请输入任务编号/任务名称关键字" - onSearch={(value) => setSearchInput(value)} + onSearch={(value) => { setSearchInput(value); setCurPage(1); }} />