Commit 0bec6df5 authored by alwayOnlie's avatar alwayOnlie

修改bug

parent 2dc3fabd
...@@ -8,6 +8,7 @@ import { ...@@ -8,6 +8,7 @@ import {
import style from '../index.less'; import style from '../index.less';
import { history } from 'umi' import { history } from 'umi'
import { IAntdSchemaFormProps } from '@formily/antd' import { IAntdSchemaFormProps } from '@formily/antd'
import moment from 'moment';
export interface Iprops extends IAntdSchemaFormProps { export interface Iprops extends IAntdSchemaFormProps {
/* 付款计划数组 */ /* 付款计划数组 */
...@@ -73,7 +74,7 @@ const PaymentCard: React.FC<Iprops> = ({ ...@@ -73,7 +74,7 @@ const PaymentCard: React.FC<Iprops> = ({
</div> </div>
<div className={style.warp_ListItem}> <div className={style.warp_ListItem}>
<div className={style.label}>预计付款时间:</div> <div className={style.label}>预计付款时间:</div>
<div className={style.text}>{item.expectPayTime}</div> <div className={style.text}>{item.expectPayTime ? item.expectPayTime : moment(item.payTime).format('YYYY-MM-DD')}</div>
</div> </div>
<div className={style.warp_ListItem}> <div className={style.warp_ListItem}>
<div className={style.label}>付款方式:</div> <div className={style.label}>付款方式:</div>
......
...@@ -14,6 +14,8 @@ import style from '../index.less' ...@@ -14,6 +14,8 @@ import style from '../index.less'
import { ColumnType } from 'antd/lib/table/interface'; import { ColumnType } from 'antd/lib/table/interface';
import EyePreview from '@/components/EyePreview'; import EyePreview from '@/components/EyePreview';
import { PublicApi } from '@/services/api'; import { PublicApi } from '@/services/api';
import moment from 'moment';
export interface Iprops extends IAntdSchemaFormProps { export interface Iprops extends IAntdSchemaFormProps {
popupshow: any, popupshow: any,
...@@ -163,7 +165,7 @@ const PopupDrawer: React.FC<Iprops> = ({ ...@@ -163,7 +165,7 @@ const PopupDrawer: React.FC<Iprops> = ({
</div> </div>
<div className={style.menuCard}> <div className={style.menuCard}>
<div className={style.menulabel}>付款时间:</div> <div className={style.menulabel}>付款时间:</div>
<div className={style.card}>{basicData.payTime}</div> <div className={style.card}>{moment(basicData.payTime).format('YYYY-MM-DD')}</div>
</div> </div>
<div className={style.menuCard}> <div className={style.menuCard}>
......
...@@ -124,6 +124,7 @@ const BillDetails = (props: any) => { ...@@ -124,6 +124,7 @@ const BillDetails = (props: any) => {
}).finally(() => { }).finally(() => {
msg(); msg();
}); });
return;
} if (type == 'pageToBeSubmit') { } if (type == 'pageToBeSubmit') {
console.log('type') console.log('type')
const msg = message.loading({ const msg = message.loading({
...@@ -229,7 +230,7 @@ const BillDetails = (props: any) => { ...@@ -229,7 +230,7 @@ const BillDetails = (props: any) => {
<div> <div>
{ {
type && <Button type="primary" style={{ width: 80, marginRight: 16 }} onClick={() => submitExaminefunds()}>{type == 'PageToBeSubmit' ? '提交请款单' : type === 'pageDetailList' ? '作废' : '审核'} </Button> type && <Button type="primary" style={{ width: 80, marginRight: 16 }} onClick={() => submitExaminefunds()}>{type == 'PageToBeSubmit' ? '提交请款单' : type === 'pageDetailList' ? '作废' : type === 'submitExamine' ? '提交' : '审核'} </Button>
} }
</div> </div>
</Anchor> </Anchor>
......
...@@ -110,8 +110,8 @@ const AddInfo = (props: any) => { ...@@ -110,8 +110,8 @@ const AddInfo = (props: any) => {
contractId: basicsData.contractId, contractId: basicsData.contractId,
bankAccount: basicsData.bankAccount, // 银行卡号 bankAccount: basicsData.bankAccount, // 银行卡号
remark: basicsData.remark, // 描述 remark: basicsData.remark, // 描述
account: auth ? auth.account : '', account: res.data.payeeMemberName : '',
payeeName: res.data.corporateAccountConfig.name, payeeName: res.data.payeeMemberName,
bankDeposit: basicsData.bankDeposit, bankDeposit: basicsData.bankDeposit,
payRatio: basicsData.payRatio, payRatio: basicsData.payRatio,
applyAmount: basicsData.applyAmount, applyAmount: basicsData.applyAmount,
......
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