tongChong
/
forgeplus-react
forked from Gitlink/forgeplus-react
1
0
Fork 1
Code Issues Pull Requests 1 Releases Wiki Activity

修改搜索回到第一页的问题

This commit is contained in:
何童崇 2021-08-10 17:32:31 +08:00
parent 81c93d2580
commit 00b41844bb
6 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/military/task/components/itemDelayManage/index.jsx
View File

@ -182,7 +182,7 @@ export default Form.create()((props) => {
<span className="with30 fl lineh-35">
<span className="color-grey-9 fl">发布方式:</span>
<span className="infos_item mr15 fl">{item.task && item.task.publishMode === 1 ? '统筹任务' : '自主提交'}</span>
<span className="infos_item mr15 fl">{item.publishMode === 1 ? '统筹任务' : '自主提交'}</span>
</span>
</div>
@ -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 && '未上传支付报酬凭证'
}

2
src/military/task/components/itemListMyTask/index.jsx
View File

@ -234,7 +234,7 @@ export default Form.create()((props) => {
{item.status === 6 && item.agreementSigning === 0 && <a className="line_1 color-blue" onClick={() => { signMethodModal(item) }}>选择协议签订方式</a>}
{item.status === 6 && item.agreementSigning === 2 && item.contractStatus === null && <a className="line_1 color-blue" onClick={() => { uploadAgree(item) }}>上传委托协议</a>}
{item.status === 6 && item.agreementSigning === 2 && (item.contractStatus === null || item.contractStatus === 0) && <a className="line_1 color-blue" onClick={() => { uploadAgree(item) }}>上传委托协议</a>}
{item.status === 6 && item.agreementSigning === 2 && [1, 2].includes(item.contractStatus) && <a className="line_1 color-grey-9" >已上传委托协议</a>}

14
src/military/task/delayManage/index.js
View File

@ -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);}}
/>
</div>
</div>
<div className="center-screen flex-column" >
<div className="center-left-but">
<Button className="circle-button" type={publicMode === '' ? 'primary' : ''} onClick={() => { setPublicMode('') }}>全部</Button>
<Button className="circle-button" type={publicMode === 1 ? 'primary' : ''} onClick={() => { setPublicMode(1) }}>统筹任务</Button>
<Button className="circle-button" type={publicMode === 0 ? 'primary' : ''} onClick={() => { setPublicMode(0) }}>自主提交任务</Button>
<Button className="circle-button" type={publishMode === '' ? 'primary' : ''} onClick={() => { setPublishMode('') }}>全部</Button>
<Button className="circle-button" type={publishMode === 1 ? 'primary' : ''} onClick={() => { setPublishMode(1) }}>统筹任务</Button>
<Button className="circle-button" type={publishMode === 0 ? 'primary' : ''} onClick={() => { setPublishMode(0) }}>自主提交任务</Button>
</div>
{

4
src/military/task/myTask/index.jsx
View File

@ -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 }) => {
<TabPane tab="任务草稿" key="2">
{
identity === '1' && statusType === '2' && <StatusNav
identity === '1' && statusType === '2' && <StatusNav
key={'unpublishStatus'}
type={'unpublishStatus'}
options={unpublishStatusArr}

2
src/military/task/myTask/joinTask.jsx
View File

@ -194,7 +194,7 @@ export default ({ taskCategoryValueArr, showNotification }) => {
maxLength={20}
style={{ width: "300px" }}
placeholder="请输入任务编号/任务名称关键字"
onSearch={(value) => setSearchInput(value)}
onSearch={(value) => { setSearchInput(value); setCurPage(1); }}
/>
}
>

4
src/military/task/taskList/index.jsx
View File

@ -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); }}
/>
<Button className="mr20 font-12" type="primary" onClick={goAdd}><i className="iconfont icon-zaibianji font-12 mr3"></i>发布任务</Button>