Commit 6c24702b authored by alwayOnlie's avatar alwayOnlie

曾加请款参数

parent f58bf2c4
...@@ -7,8 +7,8 @@ import { ...@@ -7,8 +7,8 @@ import {
SaveOutlined, SaveOutlined,
} from '@ant-design/icons' } from '@ant-design/icons'
import ReutrnEle from '@/components/ReturnEle'; import ReutrnEle from '@/components/ReturnEle';
import AddInfo from './components/info' import AddInfo from './components/Info'
import InfoTable from './components/table' import InfoTable from './components/Table'
import { PublicApi } from '@/services/api'; import { PublicApi } from '@/services/api';
const formActions = createFormActions(); const formActions = createFormActions();
......
...@@ -6,7 +6,7 @@ import { ArrowLeftOutlined } from '@ant-design/icons'; ...@@ -6,7 +6,7 @@ import { ArrowLeftOutlined } from '@ant-design/icons';
import { history } from 'umi'; import { history } from 'umi';
import { PublicApi } from '@/services/api'; import { PublicApi } from '@/services/api';
import Examine from '../../components/examine' import Examine from '../../components/examine'
import Materials from './components/materials' import Materials from './components/Materials'
import ColumnsList from './components/ColumnsList' import ColumnsList from './components/ColumnsList'
import Basic from '../../components/detailCard/basic' import Basic from '../../components/detailCard/basic'
const { Link } = Anchor; const { Link } = Anchor;
......
...@@ -86,6 +86,7 @@ const AddInfo = (props: any) => { ...@@ -86,6 +86,7 @@ const AddInfo = (props: any) => {
basicsData.expectPayTime = moment(key.expectPayTime); basicsData.expectPayTime = moment(key.expectPayTime);
basicsData.payParam = key.payParam; basicsData.payParam = key.payParam;
basicsData.payRatio = key.payRatio; basicsData.payRatio = key.payRatio;
console.log(basicsData, 'basicsData')
setBasics(basicsData) setBasics(basicsData)
setIndex(key.Index); setIndex(key.Index);
attrValueForm.setFieldsValue(basicsData); attrValueForm.setFieldsValue(basicsData);
...@@ -122,6 +123,7 @@ const AddInfo = (props: any) => { ...@@ -122,6 +123,7 @@ const AddInfo = (props: any) => {
orderTime: basicsData.orderTime, orderTime: basicsData.orderTime,
moneyPayWay: basics.moneyPayWay, moneyPayWay: basics.moneyPayWay,
payWay: basicsData.payWay, payWay: basicsData.payWay,
payParam: basicsData.payParam,
sourceType: basicsData.sourceType, sourceType: basicsData.sourceType,
moneyPayChannel: basics.moneyPayChannel, moneyPayChannel: basics.moneyPayChannel,
expectPayTime: moment(basicsData.expectPayTime), expectPayTime: moment(basicsData.expectPayTime),
......
...@@ -45,10 +45,7 @@ const Editbill: React.FC<{}> = (props: any) => { ...@@ -45,10 +45,7 @@ const Editbill: React.FC<{}> = (props: any) => {
const submit = async () => { const submit = async () => {
const basicsVO = await currentBasic.current.get(); const basicsVO = await currentBasic.current.get();
const detailList = await Object.keys(detailData.current).length != 0 ? await detailData.current.get() : []; const detailList = await Object.keys(detailData.current).length != 0 ? await detailData.current.get() : [];
let msg = message.loading({
content: '正在操作',
duration: 0,
});
let data = { let data = {
basics: basicsVO.data, basics: basicsVO.data,
detailList: detailList, detailList: detailList,
...@@ -61,8 +58,13 @@ const Editbill: React.FC<{}> = (props: any) => { ...@@ -61,8 +58,13 @@ const Editbill: React.FC<{}> = (props: any) => {
history.push('/memberCenter/contract/funds/addbill') history.push('/memberCenter/contract/funds/addbill')
} }
}).finally(() => { }).finally(() => {
msg();
}).catch((err) => {
// resolve([]);
}); });
setTimeout(() => {
setLoading(false);
}, 2000)
} }
} }
......
...@@ -97,6 +97,8 @@ const Submitpayment: React.FC<{}> = () => { ...@@ -97,6 +97,8 @@ const Submitpayment: React.FC<{}> = () => {
...params, ...params,
}).then(res => { }).then(res => {
resolve(res.data) resolve(res.data)
}).catch(err => {
console.log(err)
}) })
}) })
......
...@@ -205,6 +205,8 @@ const QueryList = () => { ...@@ -205,6 +205,8 @@ const QueryList = () => {
} }
}).finally(() => { }).finally(() => {
msg(); msg();
}).catch((err) => {
// reject();
}); });
}; };
......
import React, { useState, useRef, useEffect } from 'react' import React, { useState, useRef, useEffect } from 'react'
import { Button, Card, Tabs, message } from 'antd' import { Button, Card, Tabs, message } from 'antd'
import { PageHeaderWrapper } from '@ant-design/pro-layout' import { PageHeaderWrapper } from '@ant-design/pro-layout'
import Information from './components/information' import Information from './components/Information'
import FormList from './components/FormList' import FormList from './components/FormList'
import Fromtable from './components/fromtable' import Fromtable from './components/fromtable'
import ContractText from './components/contractText' import ContractText from './components/ContractText'
import { PublicApi } from '@/services/api'; import { PublicApi } from '@/services/api';
import { history } from 'umi' import { history } from 'umi'
import { import {
......
...@@ -121,7 +121,9 @@ const Details = (props: any) => { ...@@ -121,7 +121,9 @@ const Details = (props: any) => {
setcontractAbstract(contractAbstract) setcontractAbstract(contractAbstract)
setcontractNo(basics.contractNo) setcontractNo(basics.contractNo)
} }
}) }).catch((err) => {
});
} }
const onDownload = (file: any) => { const onDownload = (file: any) => {
window.location.href = `/api/contract/contractTemplate/downloadContract?contractName=${file.contractName}&contractUrl=${file.contractUrl}` window.location.href = `/api/contract/contractTemplate/downloadContract?contractName=${file.contractName}&contractUrl=${file.contractUrl}`
...@@ -248,7 +250,9 @@ const Details = (props: any) => { ...@@ -248,7 +250,9 @@ const Details = (props: any) => {
setbidAmount(bidAmount) setbidAmount(bidAmount)
setListData(res.data.data) setListData(res.data.data)
setassociatedCategory(res.data.data[0].setassociatedCategory) setassociatedCategory(res.data.data[0].setassociatedCategory)
}) }).catch((err) => {
});
} }
// 展开/收起的回调 // 展开/收起的回调
const onExpand = expandedKeys => { const onExpand = expandedKeys => {
......
...@@ -30,7 +30,8 @@ const Information = (props: any) => { ...@@ -30,7 +30,8 @@ const Information = (props: any) => {
attrValueForm.setFieldsValue(basic) attrValueForm.setFieldsValue(basic)
} }
}) }).catch((err) => {
});
} else { } else {
attrValueForm.setFieldsValue(basic) attrValueForm.setFieldsValue(basic)
} }
......
...@@ -3,10 +3,10 @@ import { Button, Card, Tabs, Form } from 'antd' ...@@ -3,10 +3,10 @@ import { Button, Card, Tabs, Form } from 'antd'
import { PageHeaderWrapper } from '@ant-design/pro-layout' import { PageHeaderWrapper } from '@ant-design/pro-layout'
import { PublicApi } from '@/services/api'; import { PublicApi } from '@/services/api';
import { history } from 'umi' import { history } from 'umi'
import Information from './components/information' import Information from './components/Information'
import FormList from './components/FormList'; import FormList from './components/FormList';
import Fromtable from './components/Fromtable' import Fromtable from './components/Fromtable'
import ContractText from './components/contractText' import ContractText from './components/ContractText'
import { import {
SaveOutlined, SaveOutlined,
} from '@ant-design/icons' } from '@ant-design/icons'
...@@ -42,7 +42,9 @@ const Editing: React.FC<{}> = (props: any) => { ...@@ -42,7 +42,9 @@ const Editing: React.FC<{}> = (props: any) => {
setpayPlanList(payPlanList) setpayPlanList(payPlanList)
setcontractText(contractText) setcontractText(contractText)
} }
}) }).catch((err) => {
});
} }
/* 查询购物料 */ /* 查询购物料 */
const getMaterielList = () => { const getMaterielList = () => {
...@@ -54,7 +56,9 @@ const Editing: React.FC<{}> = (props: any) => { ...@@ -54,7 +56,9 @@ const Editing: React.FC<{}> = (props: any) => {
if (res.code === 1000) { if (res.code === 1000) {
setpurchaseMaterielList(res.data.data) setpurchaseMaterielList(res.data.data)
} }
}) }).catch((err) => {
console.log(err)
});
} }
useEffect(() => { useEffect(() => {
getDetail(); getDetail();
...@@ -87,7 +91,9 @@ const Editing: React.FC<{}> = (props: any) => { ...@@ -87,7 +91,9 @@ const Editing: React.FC<{}> = (props: any) => {
} else { } else {
setbtnType(false) setbtnType(false)
} }
})) })).catch((err) => {
console.log(err)
});
} }
} }
......
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