Commit 95be5490 authored by 前端-许佳敏's avatar 前端-许佳敏

fix: 修复直接关闭审核合同时会自动返回上一页

parent b6fdfcab
...@@ -58,6 +58,7 @@ ...@@ -58,6 +58,7 @@
"start:v2-220418": "cross-env PRO_ENV=v2-220418 yarn start", "start:v2-220418": "cross-env PRO_ENV=v2-220418 yarn start",
"start-fast": "cross-env NODE_OPTIONS=--max_old_space_size=4096 UMI_ENV=local umi dev", "start-fast": "cross-env NODE_OPTIONS=--max_old_space_size=4096 UMI_ENV=local umi dev",
"start-fast:v2-220418": "cross-env PRO_ENV=v2-220418 yarn start-fast", "start-fast:v2-220418": "cross-env PRO_ENV=v2-220418 yarn start-fast",
"start-fast:v2-ali-demo": "cross-env PRO_ENV=v2-ali-demo yarn start-fast",
"start:ali": "cross-env PRO_ENV=v2-ali-demo yarn start" "start:ali": "cross-env PRO_ENV=v2-ali-demo yarn start"
}, },
"lint-staged": { "lint-staged": {
......
...@@ -120,14 +120,14 @@ const Examine: React.FC<Iprops> = ({ ...@@ -120,14 +120,14 @@ const Examine: React.FC<Iprops> = ({
console.log('Failed:', errorInfo); console.log('Failed:', errorInfo);
}; };
/* 回调 */ /* 回调 */
const fetchData = (val) => { const fetchData = (val?) => {
if (val == 'onCancel') { if (val == 'onCancel') {
getfetchData({ getfetchData({
ExamineFlag: false, ExamineFlag: false,
code: 9999 code: 9999
}) })
} else { } else {
console.log('确认') console.log('关闭弹窗')
} }
} }
const uploadProps = { const uploadProps = {
...@@ -196,7 +196,7 @@ const Examine: React.FC<Iprops> = ({ ...@@ -196,7 +196,7 @@ const Examine: React.FC<Iprops> = ({
<Radio value={0}>{disagree}</Radio> <Radio value={0}>{disagree}</Radio>
</Radio.Group> </Radio.Group>
</Form.Item> </Form.Item>
<Form.Item label={isPass ? intl.formatMessage({ id: 'contract.shenhetongguoyuanyin' }) : intl.formatMessage({ id: 'contract.shenbuhetongguoyuanyin' })} rules={[{ required: true, message: intl.formatMessage({ id: 'contract.qingxuanzezuofeiriqi' }) }]}> <Form.Item label={isPass ? intl.formatMessage({ id: 'contract.shenhetongguoyuanyin' }) : intl.formatMessage({ id: 'contract.shenhebutongguoyuanyin' })} rules={[{ required: true, message: intl.formatMessage({ id: 'contract.qingxuanzezuofeiriqi' }) }]}>
</Form.Item> </Form.Item>
<Form.Item label='' name="opinion" rules={[{ required: isPass ? false : true, message: intl.formatMessage({ id: 'contract.shenhetongguoyijian' }) }]}> <Form.Item label='' name="opinion" rules={[{ required: isPass ? false : true, message: intl.formatMessage({ id: 'contract.shenhetongguoyijian' }) }]}>
<TextArea placeholder={intl.formatMessage({ id: 'contract.zaicishurunideyuanyin' })} maxLength={120} /> <TextArea placeholder={intl.formatMessage({ id: 'contract.zaicishurunideyuanyin' })} maxLength={120} />
......
...@@ -497,7 +497,7 @@ const Details = (props: any) => { ...@@ -497,7 +497,7 @@ const Details = (props: any) => {
<Radio value={0}>{intl.formatMessage({ id: 'contract.butongguo' })}</Radio> <Radio value={0}>{intl.formatMessage({ id: 'contract.butongguo' })}</Radio>
</Radio.Group> </Radio.Group>
</Form.Item> </Form.Item>
<Form.Item label={isPass ? intl.formatMessage({ id: 'contract.shenhetongguoyuanyin' }) : intl.formatMessage({ id: 'contract.shenbuhetongguoyuanyin' })} rules={[{ required: true, message: intl.formatMessage({ id: 'contract.qingxuanzezuofeiriqi' }) }]}> <Form.Item label={isPass ? intl.formatMessage({ id: 'contract.shenhetongguoyuanyin' }) : intl.formatMessage({ id: 'contract.shenhebutongguoyuanyin' })} rules={[{ required: true, message: intl.formatMessage({ id: 'contract.qingxuanzezuofeiriqi' }) }]}>
</Form.Item> </Form.Item>
<Form.Item label='' name="opinion" rules={[{ required: isPass ? false : true, message: intl.formatMessage({ id: 'contract.shenhebutongguoyijian' }) }]}> <Form.Item label='' name="opinion" rules={[{ required: isPass ? false : true, message: intl.formatMessage({ id: 'contract.shenhebutongguoyijian' }) }]}>
......
...@@ -231,7 +231,7 @@ const Sign = () => { ...@@ -231,7 +231,7 @@ const Sign = () => {
<Radio value={0}>{intl.formatMessage({ id: 'contract.butongguo' })}</Radio> <Radio value={0}>{intl.formatMessage({ id: 'contract.butongguo' })}</Radio>
</Radio.Group> </Radio.Group>
</Form.Item> </Form.Item>
<Form.Item label={isPass ? intl.formatMessage({ id: 'contract.shenhetongguoyuanyin' }) : intl.formatMessage({ id: 'contract.shenbuhetongguoyuanyin' })} rules={[{ required: true, message: intl.formatMessage({ id: 'contract.qingxuanzezuofeiriqi' }) }]}> <Form.Item label={isPass ? intl.formatMessage({ id: 'contract.shenhetongguoyuanyin' }) : intl.formatMessage({ id: 'contract.shenhebutongguoyuanyin' })} rules={[{ required: true, message: intl.formatMessage({ id: 'contract.qingxuanzezuofeiriqi' }) }]}>
</Form.Item> </Form.Item>
<Form.Item label='' name="opinion" rules={[{ required: true, message: intl.formatMessage({ id: 'contract.shenhetongguoyijian' }) }]}> <Form.Item label='' name="opinion" rules={[{ required: true, message: intl.formatMessage({ id: 'contract.shenhetongguoyijian' }) }]}>
......
...@@ -290,9 +290,11 @@ const Details = (props: any) => { ...@@ -290,9 +290,11 @@ const Details = (props: any) => {
/* 提交审核的回调 */ /* 提交审核的回调 */
const getfetchData = (data) => { const getfetchData = (data) => {
// console.log(data,'2132131') // console.log(data,'2132131')
history.goBack() if (data.code === 1000) {
history.goBack()
}
setIsModalVisible(data.ExamineFlag)
// return; // return;
// setIsModalVisible(data.ExamineFlag)
// if (data.code === 1000) { // if (data.code === 1000) {
// ref.current.reload() // ref.current.reload()
// setTimeout(() => { // setTimeout(() => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment