diff --git a/src/military/fetch.js b/src/military/fetch.js index ca7e7cc9..a13b03fb 100644 --- a/src/military/fetch.js +++ b/src/military/fetch.js @@ -3,10 +3,10 @@ import axios from 'axios'; import cookie from 'react-cookies'; // export const httpUrl='http://117.50.100.12:8001'; -// export const httpUrl='http://192.168.31.72:8081'; +export const httpUrl='http://192.168.31.72:8081'; // export const httpUrl = 'http://106.75.31.211:58088'; // export const httpUrl = 'http://192.168.31.72:8089'; -export const httpUrl = 'http://192.168.31.104:8081'; +// export const httpUrl = 'http://192.168.31.104:8081'; // export const httpUrl = 'http://192.168.31.168:8081'; diff --git a/src/military/task/components/itemListMyTask/index.jsx b/src/military/task/components/itemListMyTask/index.jsx index 2a42f75a..5a5ef22c 100644 --- a/src/military/task/components/itemListMyTask/index.jsx +++ b/src/military/task/components/itemListMyTask/index.jsx @@ -20,6 +20,8 @@ export default (props) => { const [taskId, setTaskId] = useState(); const pageSize = props.pageSize || 10; + const [visibleMethod,setVisibleMethod]=useState(false); + useEffect(() => { changePage(page); }, [page]); @@ -43,6 +45,10 @@ export default (props) => { }) } + function signMethodModal(item){ + setVisibleMethod(true); + setTaskId(item.id); + } return ( @@ -100,6 +106,7 @@ export default (props) => { {(item.status === 9) && { repairAdvice(item.advice) }} className="line_1 color-blue">审核意见} + { { signMethodModal(item.advice) }}>选择协议签订方式} {/* 支付登记 */} {/* 上传支付凭证 */} diff --git a/src/military/task/components/itemProofManage/index.jsx b/src/military/task/components/itemProofManage/index.jsx index 727bf9f4..6bc8b65a 100644 --- a/src/military/task/components/itemProofManage/index.jsx +++ b/src/military/task/components/itemProofManage/index.jsx @@ -4,7 +4,7 @@ import { Link } from "react-router-dom"; import Nodata from 'forge/Nodata'; import Loading from "src/Loading"; import { timeAgo } from 'educoder'; -import { checkPublicity } from '../../api'; +import { checkProof } from '../../api'; import { httpUrl } from 'military/fetch'; import './index.scss'; import winpng from '../../image/win.png'; @@ -27,18 +27,11 @@ export default (props) => { Modal.confirm({ title: '是否确认审批通过?', onOk() { - checkPublicity({ - // id: item.id, - // isPassed: 1, - // taskId: item.id, - // advice: "", - complaintMaterialId: 0, - isAccepted: "", - isChanged: "", - isReconsidered: "", + checkProof({ + id: item.taskResultProof.id, + isPassed: 1, + taskId: item.id, advice: "", - delayDuration: 0, - }).then(res => { if (res && res.message === 'success') { showNotification('操作成功'); @@ -59,7 +52,7 @@ export default (props) => { showNotification('请输入拒绝的理由'); return; } - checkPublicity({ + checkProof({ id: checkedItem.taskResultProof.id, taskId: checkedItem.id, isPassed: 0, diff --git a/src/military/task/components/itemPublicityComplain/index.jsx b/src/military/task/components/itemPublicityComplain/index.jsx index 0a751c71..01b6e090 100644 --- a/src/military/task/components/itemPublicityComplain/index.jsx +++ b/src/military/task/components/itemPublicityComplain/index.jsx @@ -35,8 +35,6 @@ export default Form.create()((props) => { function dealAction() { validateFields((error, values) => { - // console.log(error); - // console.log(values) if (!error) { checkPublicity({ complaintMaterialId: checkedItem.id,