Commit 50098805 authored by alwayOnlie's avatar alwayOnlie

bug修复

parent f54be542
......@@ -12,6 +12,7 @@ import { history } from 'umi'
import EyePreview from '@/components/EyePreview';
const { Text } = Typography;
const activeAnchorClassName = 'ant-anchor-link-active'
import moment from 'moment';
const Details = (props: any) => {
const ref = useRef({});
......@@ -159,7 +160,14 @@ const Details = (props: any) => {
title: '单据类型', dataIndex: 'orderTypeName', align: 'center',
},
{ title: '单据状态', dataIndex: 'orderStatusName', align: 'center', },
{ title: '单据时间', dataIndex: 'orderTime', align: 'center', },
{
title: '单据时间', dataIndex: 'orderTime', align: 'center',
render: (text: any, record: any) => {
return (
<Text>{moment(Number(text)).format('YYYY-MM-DD')}</Text>
)
}
},
{
dataIndex: 'orderAmount', align: 'center',
title: (
......
......@@ -143,6 +143,7 @@ const AddInfo = (props: any) => {
basicsData.payWay = res.data.payPlanList[0].payWay
basicsData.contractNo = selectRow.contractNo;
basicsData.contractId = selectRow.id;
basicsData.payParam = res.data.payPlanList[0].payParam
info.startTime = selectRow.startTime;
setapplyAmount(res.data.payPlanList[0].payAmount)
info.status = "同意签订合同";
......
......@@ -89,7 +89,7 @@ const BillDetails = (props: any) => {
col3: [
{ label: '合同付款阶段', extra: basics.payStage ? basics.payStage : '' },
{ label: '合同付款比例', extra: basics.payRatio ? `${basics.payRatio}%` : '' },
{ label: '请款金额', extra: basics.payRatio ? `¥${basics.payRatio}` : '' },
{ label: '请款金额', extra: basics.applyAmount ? `¥${basics.applyAmount}` : '' },
{ label: '预计付款时间', extra: basics.expectPayTime ? basics.expectPayTime : '' },
{ label: '付款方式', extra: basics.payWayName },
{ label: '支付方式', extra: basics.moneyPayWay == 2 ? '线下支付' : '' },
......
......@@ -26,7 +26,8 @@ const PurchaseList = () => {
render: (text, record) =>
<div>
<EyePreview
url={`/memberCenter/procurementAbility/offter/inquiry/preview??id=${record.demandId}&number=${record.demandNO}`}
// type={record.quotedPriceOrderId ? 'link' : 'button'}
url={`/memberCenter/procurementAbility/offter/inquiry/preview??id=${record.quotedPriceOrderId}&number=${record.quotedPriceOrderNo}`}
>
{text}
</EyePreview>
......
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