Skip to content

J
jinfa-platform
Commit 0609b1f7 authored by 前端-黄佳鑫's avatar 前端-黄佳鑫
Browse files
Options

feat: 结算能力国际化补漏

parent 0771cd72
Hide whitespace changes
Inline Side-by-side
Showing with 308 additions and 222 deletions
src/locales/zh-CN/balance.ts
View file @ 0609b1f7
......@@ -498,4 +498,81 @@ export default {
'balance.yujijiesuankaishishijian': '预计结算开始时间',
'balance.yujijiesuanjieshushijian': '预计结算结束时间',
'balance.chaxun': '查询',
'balance.jiesuanzhifufangshi': '结算支付方式',
'balance.qingtianxiejiesuanzhifufang': '请填写结算支付方式',
'balance.fukuanfangshi': '付款方式',
'balance.fukuanshijian': '付款时间',
'balance.fukuanzhuangtai': '付款状态',
'balance.zhakanfukuan': '查看付款',
'balance.kaijufapiao': '开具发票',
'balance.fapiaoguanli': '发票管理',
'balance.kaipiaoriqi': '开票日期',
'balance.kaipiaojineyuan': '开票金额(元)',
'balance.beizhu': '备注',
'balance.qingtianxiefapiaohaoma': '请填写发票号码',
'balance.qingtianxiekaipiaoriqi': '请填写开票日期',
'balance.qingtianxiekaipiaojine': '请填写开票金额(元)',
'balance.yuandingdanfapiaoxinxi': '原订单发票信息',
'balance.yuandingdanfapiaohaoma': '原订单发票号码',
'balance.yuandingdankaipiaoriqi': '原订单开票日期',
'balance.yuandingdankaipiaojine': '原订单开票金额',
'balance.tianjia': '添加',
'balance.qingkuandanhao': '请款单号',
'balance.danjuzhaiyao': '单据摘要',
'balance.qingkuanleixing': '请款类型',
'balance.qingkuanfang': '请款方',
'balance.qingkuanjine': '请款金额',
'balance.danjushijian': '单据时间',
'balance.waibuzhuangtai': '外部状态',
'balance.qingshuruqingkuandanhao': '请输入请款单号',
'balance.qingshuruqingkuandanzhaiyao': '请输入请款单摘要',
'balance.qingshurufukuanfang': '请输入付款方',
'balance.qingxuanzezhuangtai': '请选择状态',
'balance.suoyou': '所有',
'balance.daitijiao': '待提交',
'balance.yitijiao': '已提交',
'balance.yifukuan': '已付款',
'balance.danjushijianquanbu': '单据时间（全部）',
'balance.yujifukuankaishishijian': '预计付款开始时间',
'balance.yujifukuanjieshushijian': '预计付款结束时间',
'balance.duizhangdanhao': '对账单号',
'balance.shoukuanfang': '收款方',
'balance.qingshuruduizhangdanhao': '请输入对账单号',
'balance.qingshuruduizhangdanzhaiyao': '请输入对账单摘要',
'balance.qingshurushoukuanfang': '请输入收款方',
'balance.daiqueren': '待确认',
'balance.querenbutongguo': '确认不通过',
'balance.daiqingkuan': '待请款',
'balance.yiqingkuan': '已请款',
'balance.daochu': '导出',
'balance.jibenxinxi': '基本信息',
'balance.duizhangdanmingxi': '对账单明细',
'balance.fujian': '附件',
'balance.baocun': '保存',
'balance.faqiduizhangfang': '发起对账方',
'balance.duizhangzongjinehanshui': '对账总金额(含税)',
'balance.benciduizhangshuliang': '本次对账数量',
'balance.qingshuruduizhangshuliang': '请输入对账数量',
'balance.benciduizhangjine': '本次对账金额',
'balance.shanchu': '删除',
'balance.xuanze': '选择',
'balance.bianji': '编辑',
'balance.gengduo': '更多',
'balance.quedingyaotijiaoma': '确定要提交吗？',
'balance.shi': '是',
'balance.fou': '否',
'balance.qingxuanzejiesuanfangshi': '请选择结算方式',
'balance.shengchengduizhangdan': '生成对账单',
'balance.qingkuan': '请款',
'balance.queren': '确认',
'balance.liuzhuanjindu': '流转进度',
'balance.fapiaoxinxi': '发票信息',
'balance.duizhangdanleixing': '对账单类型',
'balance.zhuangtai': '状态',
'balance.duizhangzongjine': '对账总金额',
'balance.kuaididanhao': '快递单号',
'balance.kuaidigongsi': '快递公司',
'balance.jisongriqi': '寄送日期',
'balance.fapiaohaoma': '发票号码',
'balance.querenduizhangdan': '确认对账单',
}
src/pages/balance/businessReconciliation/readyAdd/add.tsx
View file @ 0609b1f7
......@@ -2,7 +2,7 @@ import React, { useEffect, useState, useMemo } from 'react';
import { Form, Button, Row, Col, Input, Table } from 'antd';
import { ColumnType } from 'antd/lib/table/interface';
import { CheckCircleOutlined, PlusOutlined } from '@ant-design/icons';
import { history } from 'umi';
import { getIntl, history } from 'umi';
import { GlobalConfig } from '@/global/config'
import { formatTimeString } from '@/utils'
......@@ -21,11 +21,11 @@ const layout: any = {
wrapperCol: { span: 24 },
labelAlign: "left"
}
const intl = getIntl();
const TABLINK = [
{ id: 'basicLayout', title: '基本信息' },
{ id: 'billLayout', title: '对账单明细' },
{ id: 'fileLayout', title: '附件', },
{ id: 'basicLayout', title: intl.formatMessage({id: 'balance.jibenxinxi'}) },
{ id: 'billLayout', title: intl.formatMessage({id: 'balance.duizhangdanmingxi'})},
{ id: 'fileLayout', title: intl.formatMessage({id: 'balance.fujian'}), },
]
const Add = () => {
......@@ -60,21 +60,21 @@ const Add = () => {
const _returnTopButton = () => {
return (
<Button type='primary'>
<CheckCircleOutlined /> 保存
<CheckCircleOutlined /> {intl.formatMessage({id: 'balance.baocun'})}
</Button>
)
}
const basicFormCol = [
{ label: '单据摘要', name: 'details', rules: [{ required: true, message: '请选择添加方式' }] },
{ label: '备注', name: 'remarks', },
{ label: intl.formatMessage({id: 'balance.danjuzhaiyao'}), name: 'details', rules: [{ required: true, message: '请选择添加方式' }] },
{ label: intl.formatMessage({id: 'balance.beizhu'}), name: 'remarks', },
]
const basicFormColRight = [
{ label: '收款方', name: 'collection', readonly: true },
{ label: '付款方', name: 'payment', readonly: true },
{ label: '发起对账方', name: 'initiator', readonly: true },
{ label: '对账总金额(含税)', name: 'money', readonly: true },
{ label: intl.formatMessage({id: 'balance.shoukuanfang'}), name: 'collection', readonly: true },
{ label: intl.formatMessage({id: 'balance.fukuanfang'}), name: 'payment', readonly: true },
{ label: intl.formatMessage({id: 'balance.faqiduizhangfang'}), name: 'initiator', readonly: true },
{ label: intl.formatMessage({id: 'balance.duizhangzongjinehanshui'}), name: 'money', readonly: true },
]
useEffect(() => {
......@@ -97,81 +97,81 @@ const Add = () => {
}
const columns: ColumnType<any>[] = [{
title: '订单号',
title: intl.formatMessage({id: 'balance.dingdanhao'}),
key: 'orderNo',
dataIndex: 'orderNo',
}, {
title: '预计结算日期',
title: intl.formatMessage({id: 'balance.yujijiesuanriqi'}),
key: 'preDate',
dataIndex: 'preDate',
}, {
title: '发货批次',
title: intl.formatMessage({id: 'balance.fahuopici'}),
key: 'batch',
dataIndex: 'batch',
}, {
title: '发货单号',
title: intl.formatMessage({id: 'balance.fahuodanhao'}),
key: 'sendOrderNo',
dataIndex: 'sendOrderNo',
}, {
title: '物料编号',
title: intl.formatMessage({id: 'balance.wuliaobianhao'}),
key: 'goodsNo',
dataIndex: 'goodsNo',
}, {
title: '物料名称',
title: intl.formatMessage({id: 'balance.wuliaomingcheng'}),
key: 'goodsName',
dataIndex: 'goodsName',
}, {
title: '规格型号',
title: intl.formatMessage({id: 'balance.guigexinghao'}),
key: 'modal',
dataIndex: 'modal',
}, {
title: '品类',
title: intl.formatMessage({id: 'balance.pinlei'}),
key: 'category',
dataIndex: 'category',
}, {
title: '品牌',
title: intl.formatMessage({id: 'balance.pinpai'}),
key: 'brand',
dataIndex: 'brand',
}, {
title: '单位',
title: intl.formatMessage({id: 'balance.danwei'}),
key: 'unit',
dataIndex: 'unit',
}, {
title: '含税/税率',
title: intl.formatMessage({id: 'balance.hanshuishuil'}),
key: 'tax',
dataIndex: 'tax',
}, {
title: '单价',
title: intl.formatMessage({id: 'balance.danjia'}),
key: 'price',
dataIndex: 'price',
}, {
title: '待对账数量',
title: intl.formatMessage({id: 'balance.daiduizhangshuliang'}),
key: 'received',
dataIndex: 'received',
}, {
title: '本次对账数量',
title: intl.formatMessage({id: 'balance.benciduizhangshuliang'}),
key: 'number',
dataIndex: 'number',
render: (text: any, record: any, index: number) => (
<Form.Item
name={`number_${index}`}
style={{ margin: 0 }}
rules={[{ required: true, message: '请输入对账数量' }]}
rules={[{ required: true, message: intl.formatMessage({id: 'balance.qingshuruduizhangshuliang'})}]}
>
<Input value={record.unitPrice} onChange={(e) => { _changeNumbers(record, e.target.value) }} addonBefore="¥" />
</Form.Item>
)
}, {
title: '本次对账金额',
title: intl.formatMessage({id: 'balance.benciduizhangjine'}),
key: 'reconciliationAmount',
dataIndex: 'reconciliationAmount',
}, {
title: '操作',
title: intl.formatMessage({id: 'balance.caozuo'}),
key: 'operate',
dataIndex: 'operate',
render: (text: any, record: any, index: number) => (
<Button type='link'>
删除
{intl.formatMessage({id: 'balance.shanchu'})}
</Button>
)
}];
......@@ -186,7 +186,7 @@ const Add = () => {
{...layout}
form={form}
>
<Card id='basicLayout' title='基本信息'>
<Card id='basicLayout' title={intl.formatMessage({id: 'balance.jibenxinxi'})}>
<Row gutter={[8, 8]}>
<Col span={12}>
<Row gutter={[8, 8]}>
......@@ -216,7 +216,7 @@ const Add = () => {
</Col>
</Row>
</Card>
<Card id='billLayout' title='对账单明细'>
<Card id='billLayout' title={intl.formatMessage({id: 'balance.duizhangdanmingxi'})}>
<Button
type='dashed'
block
......@@ -226,7 +226,7 @@ const Add = () => {
onClick={() => { setDrawerVisible(true) }}
>
<PlusOutlined />
选择
{intl.formatMessage({id: 'balance.xuanze'})}
</Button>
<Table dataSource={tabelSource} columns={columns} pagination={false} />
</Card>
......
src/pages/balance/businessReconciliation/readyAdd/index.tsx
View file @ 0609b1f7
......@@ -13,8 +13,9 @@ import { formatTimeString } from '@/utils'
import { priceFormat } from '@/utils/numberFomat'
import { createFormActions } from '@formily/antd'
import { getIntl } from 'umi';
const intl = getIntl();
const { Link, Text } = Typography;
// 待新增对账单
......@@ -30,14 +31,14 @@ const ReadyAdd: React.FC = () => {
const columns: ColumnType<any>[] = [{
title: '对账单号',
title: intl.formatMessage({id: 'balance.duizhangdanhao'}),
key: 'orderNo',
dataIndex: 'orderNo',
render: (text: any, record: any) => (
<Link>{text}</Link>
)
}, {
title: '单据摘要',
title: intl.formatMessage({id: 'balance.danjuzhaiyao'}),
key: 'details',
dataIndex: 'details',
render: (text: any, record: any) => (
......@@ -46,44 +47,44 @@ const ReadyAdd: React.FC = () => {
</Space>
)
}, {
title: '付款方',
title: intl.formatMessage({id: 'balance.fukuanfang'}),
key: 'payee',
dataIndex: 'payee',
}, {
title: '对账总金额（含税）',
title: intl.formatMessage({id: 'balance.duizhangzongjinehanshui'}),
key: 'total',
dataIndex: 'total',
render: (text: any, record: any) => `¥${priceFormat(text)}`,
width: 180
}, {
title: '单据时间',
title: intl.formatMessage({id: 'balance.danjushijian'}),
key: 'createTime',
dataIndex: 'createTime',
render: (text: any, record: any) => formatTimeString(text, 'YYYY-MM-DD HH:mm'),
width: 180
}, {
title: '外部状态',
title: intl.formatMessage({id: 'balance.waibuzhuangtai'}),
key: 'externalState',
dataIndex: 'externalState',
render: (text: any, record: any) => <StatusTag type='default' title={record.externalStateName} />
},
{
title: '操作',
title: intl.formatMessage({id: 'balance.caozuo'}),
dataIndex: 'operate',
align: 'center',
render: (text: any, record: any) => <>
{record.button === 1 && <Popconfirm title="确定要提交吗？" okText="是" cancelText="否" onConfirm={() => fetchSubmitBatch(record.id)}>
{record.button === 1 && <Popconfirm title={intl.formatMessage({id: 'balance.quedingyaotijiaoma'})} okText={intl.formatMessage({id: 'balance.shi'})} cancelText={intl.formatMessage({id: 'balance.fou'})} onConfirm={() => fetchSubmitBatch(record.id)}>
<Button type='link'>
提交
{intl.formatMessage({id: 'balance.tijiao'})}
</Button>
</Popconfirm>}
<Dropdown overlay={() => (
<Menu onClick={(e) => handleMenuClick(e, record)}>
<Menu.Item key="1">编辑</Menu.Item>
<Menu.Item key="2" disabled={!(record.button === 1)}>删除</Menu.Item>
<Menu.Item key="1">{intl.formatMessage({id: 'balance.bianji'})}</Menu.Item>
<Menu.Item key="2" disabled={!(record.button === 1)}>{intl.formatMessage({id: 'balance.shanchu'})}</Menu.Item>
</Menu>
)}>
<Button type='link'>更多<CaretDownOutlined /></Button>
<Button type='link'>{intl.formatMessage({id: 'balance.gengduo'})}<CaretDownOutlined /></Button>
</Dropdown>
</>
}];
......@@ -126,7 +127,7 @@ const ReadyAdd: React.FC = () => {
type: 'string',
"x-component": 'Search',
'x-component-props': {
placeholder: '请输入对账单号',
placeholder: intl.formatMessage({id: 'balance.qingshuruduizhangdanhao'}),
align: 'flex-start',
},
},
......@@ -149,26 +150,26 @@ const ReadyAdd: React.FC = () => {
"digest": {
type: 'string',
'x-component-props': {
placeholder: '请输入对账单摘要',
placeholder: intl.formatMessage({id: 'balance.qingshuruduizhangdanzhaiyao'}),
}
},
"memberName": {
type: 'string',
"x-component-props": {
placeholder: '请输入付款方'
placeholder: intl.formatMessage({id: 'balance.qingshurufukuanfang'})
}
},
"[startDate,endDate]": {
type: 'string',
"x-component": "dateSelect",
"x-component-props": {
placeholder: '单据时间（全部）',
placeholder: intl.formatMessage({id: 'balance.danjushijianquanbu'}),
}
},
submit: {
'x-component': 'Submit',
'x-component-props': {
children: '查询',
children: intl.formatMessage({id: 'balance.chaxun'}),
},
},
},
......
src/pages/balance/businessReconciliation/readyReconciliation/index.tsx
View file @ 0609b1f7
......@@ -14,8 +14,9 @@ import { priceFormat } from '@/utils/numberFomat'
import { useRowSelectionTable } from '@/hooks/useRowSelectionTable';
import { createFormActions } from '@formily/antd'
import { getIntl } from 'umi';
const intl = getIntl();
const { Link, Text } = Typography;
// 对账单查询
......@@ -70,124 +71,124 @@ const ReadyReconciliation: React.FC = () => {
}
const columns: ColumnType<any>[] = [{
title: '订单号',
title: intl.formatMessage({id: 'balance.dingdanhao'}),
key: 'orderNo',
dataIndex: 'orderNo',
render: (text: any, record: any) => (
<Link>{text}</Link>
)
}, {
title: '付款方',
title: intl.formatMessage({id: 'balance.fukuanfang'}),
key: 'payee',
dataIndex: 'payee',
}, {
title: '发货批次',
title: intl.formatMessage({id: 'balance.fahuopici'}),
key: 'batch',
dataIndex: 'batch',
render: (text: any, record: any) => `第${text}批`,
}, {
title: '发货单号',
title: intl.formatMessage({id: 'balance.fahuodanhao'}),
key: 'sendOrderNo',
dataIndex: 'sendOrderNo',
render: (text: any, record: any) => (
<Link>{text}</Link>
)
}, {
title: '发货时间',
title: intl.formatMessage({id: 'balance.fahuoshijian'}),
key: 'sendOrderTime',
dataIndex: 'sendOrderTime',
render: (text: any, record: any) => formatTimeString(text, 'YYYY-MM-DD HH:mm'),
width: 180
}, {
title: '收货单号',
title: intl.formatMessage({id: 'balance.shouhuodanhao'}),
key: 'receivingOrderNo',
dataIndex: 'receivingOrderNo',
render: (text: any, record: any) => (
<Link>{text}</Link>
)
}, {
title: '收货时间',
title: intl.formatMessage({id: 'balance.shouhuoshijian'}),
key: 'receivingOrderTime',
dataIndex: 'receivingOrderTime',
render: (text: any, record: any) => formatTimeString(text, 'YYYY-MM-DD HH:mm'),
width: 180
}, {
title: '订单状态',
title: intl.formatMessage({id: 'balance.dingdanzhuangtai'}),
key: 'orderStatus',
dataIndex: 'orderStatus',
render: (text: any, record: any) => <StatusTag type='default' title={record.orderStatus} />
}, {
title: '订单类型',
title: intl.formatMessage({id: 'balance.dingdanleixing'}),
key: 'orderType',
dataIndex: 'orderType',
render: (text: any, record: any) => <StatusTag type='default' title={record.orderType} />
}, {
title: '单据类型',
title: intl.formatMessage({id: 'balance.danjuleixing'}),
key: 'type',
dataIndex: 'type',
render: (text: any, record: any) => <StatusTag type='default' title={record.type} />
}];
const childColumns: ColumnType<any>[] = [{
title: '结算方式',
title: intl.formatMessage({id: 'balance.jiesuanfangshi'}),
key: 'function',
dataIndex: 'function',
}, {
title: '预计结算日期',
title: intl.formatMessage({id: 'balance.yujijiesuanriqi'}),
key: 'preDate',
dataIndex: 'preDate',
}, {
title: '物料编号',
title: intl.formatMessage({id: 'balance.wuliaobianhao'}),
key: 'goodsNo',
dataIndex: 'goodsNo',
}, {
title: '物料名称',
title: intl.formatMessage({id: 'balance.wuliaomingcheng'}),
key: 'goodsName',
dataIndex: 'goodsName',
}, {
title: '规格型号',
title: intl.formatMessage({id: 'balance.guigexinghao'}),
key: 'sendOrderTime',
dataIndex: 'sendOrderTime',
render: (text: any, record: any) => formatTimeString(text, 'YYYY-MM-DD HH:mm'),
width: 180
}, {
title: '品类',
title: intl.formatMessage({id: 'balance.pinlei'}),
key: 'category',
dataIndex: 'category',
}, {
title: '品牌',
title: intl.formatMessage({id: 'balance.pinpai'}),
key: 'brand',
dataIndex: 'brand',
}, {
title: '单位',
title: intl.formatMessage({id: 'balance.danwei'}),
key: 'unit',
dataIndex: 'unit',
}, {
title: '含税/税率',
title: intl.formatMessage({id: 'balance.hanshuishuil'}),
key: 'tax',
dataIndex: 'tax',
}, {
title: '单价',
title: intl.formatMessage({id: 'balance.danjia'}),
key: 'price',
dataIndex: 'price',
}, {
title: '收货数量',
title: intl.formatMessage({id: 'balance.shouhuoshuliang'}),
key: 'received',
dataIndex: 'received',
}, {
title: '已对账天数',
title: intl.formatMessage({id: 'balance.yiduizhangtianshu'}),
key: 'days',
dataIndex: 'days',
}, {
title: '已对账金额',
title: intl.formatMessage({id: 'balance.yiduizhangjine'}),
key: 'reconciliationAmount',
dataIndex: 'reconciliationAmount',
}, {
title: '待对账数量',
title: intl.formatMessage({id: 'balance.daiduizhangshuliang'}),
key: 'reconciliationNumber',
dataIndex: 'reconciliationNumber',
}, {
title: '待对账金额',
title: intl.formatMessage({id: 'balance.daiduizhangjine'}),
key: 'reconciliationAmount',
dataIndex: 'reconciliationAmount',
}];
......@@ -374,7 +375,7 @@ const ReadyReconciliation: React.FC = () => {
type: 'string',
"x-component": 'Search',
'x-component-props': {
placeholder: '请输入对账单号',
placeholder: intl.formatMessage({id: 'balance.qingshuruduizhangdanhao'}),
align: 'flex-end',
},
},
......@@ -396,25 +397,25 @@ const ReadyReconciliation: React.FC = () => {
"memberName": {
type: 'string',
"x-component-props": {
placeholder: '请输入付款方'
placeholder: intl.formatMessage({id: 'balance.qingshurufukuanfang'})
}
},
"sendNo": {
type: 'string',
'x-component-props': {
placeholder: '请输入发货单号',
placeholder: intl.formatMessage({id: 'balance.qingshurufahuodanhao'}),
}
},
"receivingNo": {
type: 'string',
'x-component-props': {
placeholder: '请输入收货单号',
placeholder: intl.formatMessage({id: 'balance.qingshurushouhuodanhao'}),
}
},
"function": {
type: 'string',
"x-component-props": {
placeholder: '请选择结算方式'
placeholder: intl.formatMessage({id: 'balance.qingxuanzejiesuanfangshi'})
},
enum: [
{ label: '全部', value: '' },
......@@ -428,13 +429,13 @@ const ReadyReconciliation: React.FC = () => {
type: 'string',
"x-component": "daterange",
"x-component-props": {
placeholder: ['预计结算开始时间', '预计结算结束时间'],
placeholder: [intl.formatMessage({id: 'balance.yujijiesuankaishishijian'}), intl.formatMessage({id: 'balance.yujijiesuanjieshushijian'})],
}
},
submit: {
'x-component': 'Submit',
'x-component-props': {
children: '查询',
children: intl.formatMessage({id: 'balance.chaxun'}),
},
},
},
......@@ -445,7 +446,7 @@ const ReadyReconciliation: React.FC = () => {
Submit,
controllerBtns: () => (
<Space>
<Button size='middle'>生成对账单</Button>
<Button size='middle'>{intl.formatMessage({id: 'balance.shengchengduizhangdan'})}</Button>
</Space>
),
}}
......
src/pages/balance/businessReconciliation/search/index.tsx
View file @ 0609b1f7
......@@ -13,7 +13,8 @@ import { priceFormat } from '@/utils/numberFomat'
import { useRowSelectionTable } from '@/hooks/useRowSelectionTable';
import { createFormActions } from '@formily/antd'
import { getIntl } from 'umi';
const intl = getIntl();
const { Link, Text } = Typography;
......@@ -34,14 +35,14 @@ const Search: React.FC = () => {
});
const columns: ColumnType<any>[] = [{
title: '对账单号',
title: intl.formatMessage({id: 'balance.duizhangdanhao'}),
key: 'orderNo',
dataIndex: 'orderNo',
render: (text: any, record: any) => (
<Link>{text}</Link>
)
}, {
title: '单据摘要',
title: intl.formatMessage({id: 'balance.danjuzhaiyao'}),
key: 'details',
dataIndex: 'details',
render: (text: any, record: any) => (
......@@ -50,23 +51,23 @@ const Search: React.FC = () => {
</Space>
)
}, {
title: '付款方',
title: intl.formatMessage({id: 'balance.fukuanfang'}),
key: 'payee',
dataIndex: 'payee',
}, {
title: '对账总金额（含税）',
title: intl.formatMessage({id: 'balance.duizhangzongjinehanshui'}),
key: 'total',
dataIndex: 'total',
render: (text: any, record: any) => `¥${priceFormat(text)}`,
width: 180
}, {
title: '单据时间',
title: intl.formatMessage({id: 'balance.danjushijian'}),
key: 'createTime',
dataIndex: 'createTime',
render: (text: any, record: any) => formatTimeString(text, 'YYYY-MM-DD HH:mm'),
width: 180
}, {
title: '外部状态',
title: intl.formatMessage({id: 'balance.waibuzhuangtai'}),
key: 'externalState',
dataIndex: 'externalState',
render: (text: any, record: any) => <StatusTag type='default' title={record.externalStateName} />
......@@ -111,7 +112,7 @@ const Search: React.FC = () => {
type: 'string',
"x-component": 'Search',
'x-component-props': {
placeholder: '请输入对账单号',
placeholder: intl.formatMessage({id: 'balance.qingshuruduizhangdanhao'}),
align: 'flex-end',
},
},
......@@ -133,19 +134,19 @@ const Search: React.FC = () => {
"digest": {
type: 'string',
'x-component-props': {
placeholder: '请输入对账单摘要',
placeholder: intl.formatMessage({id: 'balance.qingshuruduizhangdanzhaiyao'}),
}
},
"memberName": {
type: 'string',
"x-component-props": {
placeholder: '请输入付款方'
placeholder: intl.formatMessage({id: 'balance.qingshurufukuanfang'})
}
},
"innerStatus": {
type: 'string',
"x-component-props": {
placeholder: '请选择状态'
placeholder: intl.formatMessage({id: 'balance.qingxuanzezhuangtai'})
},
enum: [
{ label: '所有', value: '' },
......@@ -160,13 +161,13 @@ const Search: React.FC = () => {
type: 'string',
"x-component": "dateSelect",
"x-component-props": {
placeholder: '单据时间（全部）',
placeholder: intl.formatMessage({id: 'balance.danjushijianquanbu'}),
}
},
submit: {
'x-component': 'Submit',
'x-component-props': {
children: '查询',
children: intl.formatMessage({id: 'balance.chaxun'}),
},
},
},
......@@ -177,7 +178,7 @@ const Search: React.FC = () => {
Submit,
controllerBtns: () => (
<Space>
<Button size='middle'>导出</Button>
<Button size='middle'>{intl.formatMessage({id: 'balance.daochu'})}</Button>
</Space>
),
}}
......
src/pages/balance/businessReconciliationCollaboration/detail/index.tsx
View file @ 0609b1f7
import React, { Fragment, useEffect, useState, useMemo } from 'react';
import { Badge, Popconfirm, Button } from 'antd';
import { history } from 'umi';
import { getIntl, history } from 'umi';
import { CheckCircleOutlined } from '@ant-design/icons';
import { GlobalConfig } from '@/global/config'
......@@ -12,13 +12,13 @@ import PeripheralLayout from '@/pages/transaction/purchaseAbility/components/det
import Card from '@/pages/transaction/purchaseAbility/components/card';
import ProgressLayout, { ProgressValue } from '@/pages/transaction/purchaseAbility/components/detail/components/progressCommonLayout';
import CommonLayout from '@/pages/transaction/purchaseAbility/components/detail/components/bidCommonLayout';
const intl = getIntl();
const TABLINK = [
{ id: 'progressLayout', title: '流转进度' },
{ id: 'basicLayout', title: '基本信息' },
{ id: 'billLayout', title: '对账单明细' },
{ id: 'fileLayout', title: '附件', },
{ id: 'invoiceLayout', title: '发票信息', },
{ id: 'progressLayout', title: intl.formatMessage({id: 'balance.liuzhuanjindu'}) },
{ id: 'basicLayout', title: intl.formatMessage({id: 'balance.jibenxinxi'}) },
{ id: 'billLayout', title: intl.formatMessage({id: 'balance.duizhangdanmingxi'})},
{ id: 'fileLayout', title: intl.formatMessage({id: 'balance.fujian'}), },
{ id: 'invoiceLayout', title: intl.formatMessage({id: 'balance.fapiaoxinxi'}), },
]
const SearchDetail = () => {
......@@ -36,20 +36,20 @@ const SearchDetail = () => {
[
{
col: [
{ label: '对账单号', extra: 'BL202108171640', type: 'text' },
{ label: '单据摘要', extra: '2012年8月对账单', type: 'text' },
{ label: '对账单类型', extra: '物料对账单', type: 'text' },
{ label: '备注', extra: '此供应商有预付款', type: 'text' },
{ label: '状态', extra: <StatusTag type='success' title='已请款' />, type: 'text' },
{ label: intl.formatMessage({id: 'balance.duizhangdanhao'}), extra: 'BL202108171640', type: 'text' },
{ label: intl.formatMessage({id: 'balance.danjuzhaiyao'}), extra: '2012年8月对账单', type: 'text' },
{ label: intl.formatMessage({id: 'balance.duizhangdanleixing'}), extra: '物料对账单', type: 'text' },
{ label: intl.formatMessage({id: 'balance.beizhu'}), extra: '此供应商有预付款', type: 'text' },
{ label: intl.formatMessage({id: 'balance.zhuangtai'}), extra: <StatusTag type='success' title='已请款' />, type: 'text' },
]
},
{
col: [
{ label: '收款方', extra: '广州白马家具交易中心', type: 'text' },
{ label: '付款方', extra: '广州麦多', type: 'text' },
{ label: '发起对账方', extra: '广州麦多', type: 'text' },
{ label: '对账总金额', extra: '¥ 2,700.00', type: 'text' },
{ label: '单据时间', extra: '2020-12-25 12:58:25', type: 'text' },
{ label: intl.formatMessage({id: 'balance.shoukuanfang'}), extra: '广州白马家具交易中心', type: 'text' },
{ label: intl.formatMessage({id: 'balance.fukuanfang'}), extra: '广州麦多', type: 'text' },
{ label: intl.formatMessage({id: 'balance.faqiduizhangfang'}), extra: '广州麦多', type: 'text' },
{ label: intl.formatMessage({id: 'balance.duizhangzongjine'}), extra: '¥ 2,700.00', type: 'text' },
{ label: intl.formatMessage({id: 'balance.danjushijian'}), extra: '2020-12-25 12:58:25', type: 'text' },
]
},
]
......@@ -59,14 +59,14 @@ const SearchDetail = () => {
[
{
col: [
{ label: '快递单号', extra: 'SF202108171640', type: 'text' },
{ label: '快递公司', extra: '顺丰快递', type: 'text' },
{ label: intl.formatMessage({id: 'balance.kuaididanhao'}), extra: 'SF202108171640', type: 'text' },
{ label: intl.formatMessage({id: 'balance.kuaidigongsi'}), extra: '顺丰快递', type: 'text' },
]
},
{
col: [
{ label: '寄送日期', extra: '2020-08-25', type: 'text' },
{ label: '发票号码', extra: '40122826 (2020-08-21)', type: 'text' },
{ label: intl.formatMessage({id: 'balance.jisongriqi'}), extra: '2020-08-25', type: 'text' },
{ label: intl.formatMessage({id: 'balance.fapiaohaoma'}), extra: '40122826 (2020-08-21)', type: 'text' },
]
},
]
......@@ -85,14 +85,14 @@ const SearchDetail = () => {
case 'readyAdd':
return (
path != 'preview' && <Button type='primary'>
<CheckCircleOutlined /> 确认对账单
<CheckCircleOutlined /> {intl.formatMessage({id: 'balance.querenduizhangdan'})}
</Button>
)
case 'readyConfirm':
return (
path != 'preview' && <Popconfirm title="确定要提交吗？" okText="是" cancelText="否">
path != 'preview' && <Popconfirm title={intl.formatMessage({id: 'balance.quedingyaotijiaoma'})} okText={intl.formatMessage({id: 'balance.shi'})} cancelText={intl.formatMessage({id: 'balance.fou'})}>
<Button type='primary'>
<CheckCircleOutlined /> 提交
<CheckCircleOutlined /> {intl.formatMessage({id: 'balance.tijiao'})}
</Button>
</Popconfirm>
)
......@@ -110,14 +110,14 @@ const SearchDetail = () => {
components={
<Fragment>
<ProgressLayout effect={[{ title: '外部流转', state: 1, logs: [] }]} />
<CommonLayout layoutId="basicLayout" title="基本信息" effect={basicEffect} commonSpan={12} />
<Card id='billLayout' title='对账单明细'>
<CommonLayout layoutId="basicLayout" title={intl.formatMessage({id: 'balance.jibenxinxi'})} effect={basicEffect} commonSpan={12} />
<Card id='billLayout' title={intl.formatMessage({id: 'balance.duizhangdanmingxi'})}>
</Card>
<Card id='fileLayout' title='附件'>
<Card id='fileLayout' title={intl.formatMessage({id: 'balance.fujian'})}>
</Card>
<CommonLayout layoutId="invoiceLayout" title="发票信息" effect={invoiceEffect} commonSpan={12} />
<CommonLayout layoutId="invoiceLayout" title={intl.formatMessage({id: 'balance.fapiaoxinxi'})} effect={invoiceEffect} commonSpan={12} />
</Fragment>
}
/>
......
src/pages/balance/businessReconciliationCollaboration/readyConfirm/index.tsx
View file @ 0609b1f7
......@@ -12,8 +12,9 @@ import { formatTimeString } from '@/utils'
import { priceFormat } from '@/utils/numberFomat'
import { createFormActions } from '@formily/antd'
import { getIntl } from 'umi';
const intl = getIntl();
const { Link, Text } = Typography;
// 对账单查询
......@@ -28,14 +29,14 @@ const ReadyConfirm: React.FC = () => {
// }
const columns: ColumnType<any>[] = [{
title: '对账单号',
title: intl.formatMessage({id: 'balance.duizhangdanhao'}),
key: 'orderNo',
dataIndex: 'orderNo',
render: (text: any, record: any) => (
<Link>{text}</Link>
)
}, {
title: '单据摘要',
title: intl.formatMessage({id: 'balance.danjuzhaiyao'}),
key: 'details',
dataIndex: 'details',
render: (text: any, record: any) => (
......@@ -44,31 +45,31 @@ const ReadyConfirm: React.FC = () => {
</Space>
)
}, {
title: '收款方',
title: intl.formatMessage({id: 'balance.shoukuanfang'}),
key: 'payee',
dataIndex: 'payee',
}, {
title: '对账总金额（含税）',
title: intl.formatMessage({id: 'balance.duizhangzongjinehanshui'}),
key: 'total',
dataIndex: 'total',
render: (text: any, record: any) => `¥${priceFormat(text)}`,
width: 180
}, {
title: '单据时间',
title: intl.formatMessage({id: 'balance.danjushijian'}),
key: 'createTime',
dataIndex: 'createTime',
render: (text: any, record: any) => formatTimeString(text, 'YYYY-MM-DD HH:mm'),
width: 180
}, {
title: '外部状态',
title: intl.formatMessage({id: 'balance.waibuzhuangtai'}),
key: 'externalState',
dataIndex: 'externalState',
render: (text: any, record: any) => <StatusTag type='default' title={record.externalStateName} />
}, {
title: '操作',
title: intl.formatMessage({id: 'balance.caozuo'}),
key: 'operate',
dataIndex: 'operate',
render: (text: any, record: any) => <Button type='link'>确认</Button>
render: (text: any, record: any) => <Button type='link'>{intl.formatMessage({id: 'balance.queren'})}</Button>
}];
return (
......@@ -105,7 +106,7 @@ const ReadyConfirm: React.FC = () => {
type: 'string',
"x-component": 'Search',
'x-component-props': {
placeholder: '请输入对账单号',
placeholder: intl.formatMessage({id: 'balance.qingshuruduizhangdanhao'}),
align: 'flex-start',
},
},
......@@ -127,26 +128,26 @@ const ReadyConfirm: React.FC = () => {
"digest": {
type: 'string',
'x-component-props': {
placeholder: '请输入对账单摘要',
placeholder: intl.formatMessage({id: 'balance.qingshuruduizhangdanzhaiyao'}),
}
},
"memberName": {
type: 'string',
"x-component-props": {
placeholder: '请输入收款方'
placeholder: intl.formatMessage({id: 'balance.qingshurushoukuanfang'})
}
},
"[startDate,endDate]": {
type: 'string',
"x-component": "dateSelect",
"x-component-props": {
placeholder: '单据时间（全部）',
placeholder: intl.formatMessage({id: 'balance.danjushijianquanbu'}),
}
},
submit: {
'x-component': 'Submit',
'x-component-props': {
children: '查询',
children: intl.formatMessage({id: 'balance.chaxun'}),
},
},
},
......
src/pages/balance/businessReconciliationCollaboration/readyPay/index.tsx
View file @ 0609b1f7
......@@ -12,8 +12,9 @@ import { formatTimeString } from '@/utils'
import { priceFormat } from '@/utils/numberFomat'
import { createFormActions } from '@formily/antd'
import { getIntl } from 'umi';
const intl = getIntl();
const { Link, Text } = Typography;
// 对账单查询
......@@ -28,14 +29,14 @@ const ReadyPay: React.FC = () => {
// }
const columns: ColumnType<any>[] = [{
title: '对账单号',
title: intl.formatMessage({id: 'balance.duizhangdanhao'}),
key: 'orderNo',
dataIndex: 'orderNo',
render: (text: any, record: any) => (
<Link>{text}</Link>
)
}, {
title: '单据摘要',
title: intl.formatMessage({id: 'balance.danjuzhaiyao'}),
key: 'details',
dataIndex: 'details',
render: (text: any, record: any) => (
......@@ -44,31 +45,31 @@ const ReadyPay: React.FC = () => {
</Space>
)
}, {
title: '收款方',
title: intl.formatMessage({id: 'balance.shoukuanfang'}),
key: 'payee',
dataIndex: 'payee',
}, {
title: '对账总金额（含税）',
title: intl.formatMessage({id: 'balance.duizhangzongjinehanshui'}),
key: 'total',
dataIndex: 'total',
render: (text: any, record: any) => `¥${priceFormat(text)}`,
width: 180
}, {
title: '单据时间',
title: intl.formatMessage({id: 'balance.danjushijian'}),
key: 'createTime',
dataIndex: 'createTime',
render: (text: any, record: any) => formatTimeString(text, 'YYYY-MM-DD HH:mm'),
width: 180
}, {
title: '外部状态',
title: intl.formatMessage({id: 'balance.waibuzhuangtai'}),
key: 'externalState',
dataIndex: 'externalState',
render: (text: any, record: any) => <StatusTag type='default' title={record.externalStateName} />
}, {
title: '操作',
title: intl.formatMessage({id: 'balance.caozuo'}),
key: 'operate',
dataIndex: 'operate',
render: (text: any, record: any) => <Button type='link'>请款</Button>
render: (text: any, record: any) => <Button type='link'>{intl.formatMessage({id: 'balance.qingkuan'})}</Button>
}];
return (
......@@ -105,7 +106,7 @@ const ReadyPay: React.FC = () => {
type: 'string',
"x-component": 'Search',
'x-component-props': {
placeholder: '请输入对账单号',
placeholder: intl.formatMessage({id: 'balance.qingshuruduizhangdanhao'}),
align: 'flex-start',
},
},
......@@ -127,26 +128,26 @@ const ReadyPay: React.FC = () => {
"digest": {
type: 'string',
'x-component-props': {
placeholder: '请输入对账单摘要',
placeholder: intl.formatMessage({id: 'balance.qingshuruduizhangdanzhaiyao'}),
}
},
"memberName": {
type: 'string',
"x-component-props": {
placeholder: '请输入收款方'
placeholder: intl.formatMessage({id: 'balance.qingshurushoukuanfang'})
}
},
"[startDate,endDate]": {
type: 'string',
"x-component": "dateSelect",
"x-component-props": {
placeholder: '单据时间（全部）',
placeholder: intl.formatMessage({id: 'balance.danjushijianquanbu'}),
}
},
submit: {
'x-component': 'Submit',
'x-component-props': {
children: '查询',
children: intl.formatMessage({id: 'balance.chaxun'}),
},
},
},
......
src/pages/balance/businessReconciliationCollaboration/search/index.tsx
View file @ 0609b1f7
......@@ -13,7 +13,8 @@ import { priceFormat } from '@/utils/numberFomat'
import { useRowSelectionTable } from '@/hooks/useRowSelectionTable';
import { createFormActions } from '@formily/antd'
import { getIntl } from 'umi';
const intl = getIntl();
const { Link, Text } = Typography;
......@@ -34,14 +35,14 @@ const Search: React.FC = () => {
});
const columns: ColumnType<any>[] = [{
title: '对账单号',
title: intl.formatMessage({id: 'balance.duizhangdanhao'}),
key: 'orderNo',
dataIndex: 'orderNo',
render: (text: any, record: any) => (
<Link>{text}</Link>
)
}, {
title: '单据摘要',
title: intl.formatMessage({id: 'balance.danjuzhaiyao'}),
key: 'details',
dataIndex: 'details',
render: (text: any, record: any) => (
......@@ -50,23 +51,23 @@ const Search: React.FC = () => {
</Space>
)
}, {
title: '收款方',
title: intl.formatMessage({id: 'balance.shoukuanfang'}),
key: 'payee',
dataIndex: 'payee',
}, {
title: '对账总金额（含税）',
title: intl.formatMessage({id: 'balance.duizhangzongjinehanshui'}),
key: 'total',
dataIndex: 'total',
render: (text: any, record: any) => `¥${priceFormat(text)}`,
width: 180
}, {
title: '单据时间',
title: intl.formatMessage({id: 'balance.danjushijian'}),
key: 'createTime',
dataIndex: 'createTime',
render: (text: any, record: any) => formatTimeString(text, 'YYYY-MM-DD HH:mm'),
width: 180
}, {
title: '外部状态',
title: intl.formatMessage({id: 'balance.waibuzhuangtai'}),
key: 'externalState',
dataIndex: 'externalState',
render: (text: any, record: any) => <StatusTag type='default' title={record.externalStateName} />
......@@ -111,7 +112,7 @@ const Search: React.FC = () => {
type: 'string',
"x-component": 'Search',
'x-component-props': {
placeholder: '请输入对账单号',
placeholder: intl.formatMessage({id: 'balance.qingshuruduizhangdanhao'}),
align: 'flex-end',
},
},
......@@ -133,39 +134,39 @@ const Search: React.FC = () => {
"digest": {
type: 'string',
'x-component-props': {
placeholder: '请输入对账单摘要',
placeholder: intl.formatMessage({id: 'balance.qingshuruduizhangdanzhaiyao'}),
}
},
"memberName": {
type: 'string',
"x-component-props": {
placeholder: '请输入收款方'
placeholder: intl.formatMessage({id: 'balance.qingshurushoukuanfang'})
}
},
"innerStatus": {
type: 'string',
"x-component-props": {
placeholder: '请选择状态'
placeholder: intl.formatMessage({id: 'balance.qingxuanzezhuangtai'})
},
enum: [
{ label: '所有', value: '' },
{ label: '待确认', value: 1 },
{ label: '确认不通过', value: 2 },
{ label: '待请款', value: 3 },
{ label: '已请款', value: 4 },
{ label: intl.formatMessage({id: 'balance.suoyou'}), value: '' },
{ label: intl.formatMessage({id: 'balance.daiqueren'}), value: 1 },
{ label: intl.formatMessage({id: 'balance.querenbutongguo'}), value: 2 },
{ label: intl.formatMessage({id: 'balance.daiqingkuan'}), value: 3 },
{ label: intl.formatMessage({id: 'balance.yiqingkuan'}), value: 4 },
]
},
"[startDate,endDate]": {
type: 'string',
"x-component": "dateSelect",
"x-component-props": {
placeholder: '单据时间（全部）',
placeholder: intl.formatMessage({id: 'balance.danjushijianquanbu'}),
}
},
submit: {
'x-component': 'Submit',
'x-component-props': {
children: '查询',
children: intl.formatMessage({id: 'balance.chaxun'}),
},
},
},
......@@ -176,7 +177,7 @@ const Search: React.FC = () => {
Submit,
controllerBtns: () => (
<Space>
<Button size='middle'>导出</Button>
<Button size='middle'>{intl.formatMessage({id: 'balance.daochu'})}</Button>
</Space>
),
}}
......
src/pages/balance/businessRequestFunds/search/index.tsx
View file @ 0609b1f7
......@@ -13,7 +13,8 @@ import { priceFormat } from '@/utils/numberFomat'
import { useRowSelectionTable } from '@/hooks/useRowSelectionTable';
import { createFormActions } from '@formily/antd'
import { getIntl } from 'umi';
const intl = getIntl();
const { Link, Text } = Typography;
......@@ -29,14 +30,14 @@ const Search: React.FC = () => {
// }
const columns: ColumnType<any>[] = [{
title: '请款单号',
title: intl.formatMessage({id: 'balance.qingkuandanhao'}),
key: 'orderNo',
dataIndex: 'orderNo',
render: (text: any, record: any) => (
<Link>{text}</Link>
)
}, {
title: '单据摘要',
title: intl.formatMessage({id: 'balance.danjuzhaiyao'}),
key: 'details',
dataIndex: 'details',
render: (text: any, record: any) => (
......@@ -45,33 +46,33 @@ const Search: React.FC = () => {
</Space>
)
}, {
title: '请款类型',
title: intl.formatMessage({id: 'balance.qingkuanleixing'}),
key: 'type',
dataIndex: 'type',
}, {
title: '请款方',
title: intl.formatMessage({id: 'balance.qingkuanfang'}),
key: 'payee',
dataIndex: 'payee',
}, {
title: '请款金额',
title: intl.formatMessage({id: 'balance.qingkuanjine'}),
key: 'total',
dataIndex: 'total',
render: (text: any, record: any) => `¥${priceFormat(text)}`,
width: 180
}, {
title: '预计付款日期',
title: intl.formatMessage({id: 'balance.yujifukuanriqi'}),
key: 'payTime',
dataIndex: 'payTime',
render: (text: any, record: any) => formatTimeString(text, 'YYYY-MM-DD HH:mm'),
width: 180
}, {
title: '单据时间',
title: intl.formatMessage({id: 'balance.danjushijian'}),
key: 'createTime',
dataIndex: 'createTime',
render: (text: any, record: any) => formatTimeString(text, 'YYYY-MM-DD HH:mm'),
width: 180
}, {
title: '外部状态',
title: intl.formatMessage({id: 'balance.waibuzhuangtai'}),
key: 'externalState',
dataIndex: 'externalState',
render: (text: any, record: any) => <StatusTag type='default' title={record.externalStateName} />
......@@ -111,7 +112,7 @@ const Search: React.FC = () => {
type: 'string',
"x-component": 'Search',
'x-component-props': {
placeholder: '请输入请款单号',
placeholder: intl.formatMessage({id: 'balance.qingshuruqingkuandanhao'}),
align: 'flex-start',
},
},
......@@ -133,45 +134,45 @@ const Search: React.FC = () => {
"digest": {
type: 'string',
'x-component-props': {
placeholder: '请输入请款单摘要',
placeholder: intl.formatMessage({id: 'balance.qingshuruqingkuandanzhaiyao'}),
}
},
"memberName": {
type: 'string',
"x-component-props": {
placeholder: '请输入付款方'
placeholder: intl.formatMessage({id: 'balance.qingshurufukuanfang'})
}
},
"innerStatus": {
type: 'string',
"x-component-props": {
placeholder: '请选择状态'
placeholder: intl.formatMessage({id: 'balance.qingxuanzezhuangtai'})
},
enum: [
{ label: '所有', value: '' },
{ label: '待提交', value: 1 },
{ label: '已提交', value: 2 },
{ label: '已付款', value: 3 },
{ label: intl.formatMessage({id: 'balance.suoyou'}), value: '' },
{ label: intl.formatMessage({id: 'balance.daitijiao'}), value: 1 },
{ label: intl.formatMessage({id: 'balance.yitijiao'}), value: 2 },
{ label: intl.formatMessage({id: 'balance.yifukuan'}), value: 3 },
]
},
"[startDate,endDate]": {
type: 'string',
"x-component": "dateSelect",
"x-component-props": {
placeholder: '单据时间（全部）',
placeholder: intl.formatMessage({id: 'balance.danjushijianquanbu'}),
}
},
"[startPayDate,endPayDate]": {
type: 'string',
"x-component": "daterange",
"x-component-props": {
placeholder: ['预计付款开始时间', '预计付款结束时间'],
placeholder: [intl.formatMessage({id: 'balance.yujifukuankaishishijian'}), intl.formatMessage({id: 'balance.yujifukuanjieshushijian'})],
}
},
submit: {
'x-component': 'Submit',
'x-component-props': {
children: '查询',
children: intl.formatMessage({id: 'balance.chaxun'}),
},
},
},
......
src/pages/balance/components/InvoiceCreate/arrayList.tsx
View file @ 0609b1f7
......@@ -8,8 +8,9 @@ import { ArrayList } from '@formily/react-shared-components'
import { toArr, isFn, FormPath } from '@formily/shared'
import styles from './arrayList.less';
import { MinusOutlined, PlusOutlined, PlusSquareOutlined } from '@ant-design/icons'
import { getIntl } from 'umi';
const intl = getIntl();
const ArrayCustom = props => {
const { value, schema, className, editable, path, mutators } = props
const xComponentProps = props.props['x-component-props'];
......@@ -41,7 +42,7 @@ const ArrayCustom = props => {
})}
<div className={styles.add} onClick={onAdd}>
<PlusOutlined size={12} />
<span className={styles.addText}>添加</span>
<span className={styles.addText}>{intl.formatMessage({id: 'balance.tianjia'})}</span>
</div>
</ArrayList>
......
src/pages/balance/components/InvoiceCreate/invoice.tsx
View file @ 0609b1f7
......@@ -59,12 +59,12 @@ const InvoiceInfo: React.FC<Iprops> & { isVirtualFieldComponent: boolean } = (pr
{
infos?.originalProveList && (
<div className={styles.originalInvoice}>
<p className={styles.title}>原订单发票信息</p>
<p className={styles.title}>{intl.formatMessage({id: 'balance.yuandingdanfapiaoxinxi'})}</p>
<div className={styles.header}>
<div className={styles.defaultWidth}>原订单发票号码</div>
<div className={styles.defaultWidth}>原订单开票日期</div>
<div className={styles.defaultWidth}>原订单开票金额</div>
<div className={styles.specialWidth}>备注</div>
<div className={styles.defaultWidth}>{intl.formatMessage({id: 'balance.yuandingdanfapiaohaoma'})}</div>
<div className={styles.defaultWidth}>{intl.formatMessage({id: 'balance.yuandingdankaipiaoriqi'})}</div>
<div className={styles.defaultWidth}>{intl.formatMessage({id: 'balance.yuandingdankaipiaojine'})}</div>
<div className={styles.specialWidth}>{intl.formatMessage({id: 'balance.beizhu'})}</div>
</div>
<div className={styles.list}>
{
......
src/pages/balance/components/InvoiceCreate/invoiceDrawerInfo.tsx
View file @ 0609b1f7
......@@ -31,7 +31,7 @@ type ProveListType = {
const InvoiceDrawerInfo: React.FC<Iprops> = (props: Iprops) => {
const { visible, onCancel, invoiceInfoData, onSubmit, mode } = props;
const [initialValue, setInitialValue] = useState<{ [key: string]: ProveListType}>({});
const [initialValue, setInitialValue] = useState<{ [key: string]: ProveListType }>({});
const handleCancel = () => {
onCancel?.()
......@@ -39,7 +39,7 @@ const InvoiceDrawerInfo: React.FC<Iprops> = (props: Iprops) => {
const renderFooter = () => {
return (
<div style={{textAlign: 'right'}}>
<div style={{ textAlign: 'right' }}>
<Button onClick={handleCancel} style={{ marginRight: 8 }}>
{intl.formatMessage({ id: 'balance.components.invoiceCreate.invoiceDrawer.renderFooter.button.1' })}
</Button>
......@@ -70,7 +70,7 @@ const InvoiceDrawerInfo: React.FC<Iprops> = (props: Iprops) => {
<Drawer
visible={visible}
width={800}
title="开具发票"
title={intl.formatMessage({ id: 'balance.kaijufapiao' })}
onClose={handleCancel}
footer={renderFooter()}
>
......@@ -84,7 +84,7 @@ const InvoiceDrawerInfo: React.FC<Iprops> = (props: Iprops) => {
{
invoiceInfoData?.map((_item, key) => {
return (
<div key={key} style={{display: 'flex', flexDirection: 'column'}}>
<div key={key} style={{ display: 'flex', flexDirection: 'column' }}>
<Field
type="object"
x-component='InvoiceInfo'
......@@ -102,17 +102,17 @@ const InvoiceDrawerInfo: React.FC<Iprops> = (props: Iprops) => {
header: (
<div className={styles.header}>
<div className={styles['header-item']}>
发票管理<span className={styles.required}>*</span>
{intl.formatMessage({ id: 'balance.fapiaoguanli' })}<span className={styles.required}>*</span>
</div>
<div className={styles['header-item']}>
开票日期
{intl.formatMessage({ id: 'balance.kaipiaoriqi' })}
<span className={styles.required}>*</span>
</div>
<div className={styles['header-item']}>
开票金额(元)
{intl.formatMessage({ id: 'balance.kaipiaojineyuan' })}
<span className={styles.required}>*</span>
</div>
<div className={styles['header-item']}>备注</div>
<div className={styles['header-item']}>{intl.formatMessage({ id: 'balance.beizhu' })}</div>
</div>
)
}}
......@@ -129,7 +129,7 @@ const InvoiceDrawerInfo: React.FC<Iprops> = (props: Iprops) => {
}}
x-rules={
[
{required: true, message: '请填写发票号码'}
{ required: true, message: intl.formatMessage({ id: 'balance.qingtianxiefapiaohaoma' }) }
]
}
/>
......@@ -138,7 +138,7 @@ const InvoiceDrawerInfo: React.FC<Iprops> = (props: Iprops) => {
x-component="DatePicker"
x-rules={
[
{required: true, message: '请填写开票日期'}
{ required: true, message: intl.formatMessage({ id: 'balance.qingtianxiekaipiaoriqi' }) }
]
}
/>
......@@ -152,7 +152,7 @@ const InvoiceDrawerInfo: React.FC<Iprops> = (props: Iprops) => {
}}
x-rules={
[
{required: true, message: '请填写开票金额(元)'}
{ required: true, message: intl.formatMessage({id: 'balance.qingtianxiekaipiaojine'}) }
]
}
/>
......
src/pages/balance/components/ViewUniversalPay/index.tsx
View file @ 0609b1f7
import { Modal } from 'antd';
import React from 'react';
import { getIntl } from 'umi';
import styles from './index.less';
const intl = getIntl();
interface Iprops {
visible: boolean,
balanceInfo: {
......@@ -34,19 +35,19 @@ const ViewUniversalPay: React.FC<Iprops> = (props: Iprops) => {
const list = [
{
title: '结算金额',
title: intl.formatMessage({id: 'balance.jiesuanjine'}),
value: balanceInfo?.amount
},
{
title: '付款方式',
title: intl.formatMessage({id: 'balance.fukuanfangshi'}),
value: balanceInfo?.payWayName
},
{
title: '付款时间',
title: intl.formatMessage({id: 'balance.fukuanshijian'}),
value: balanceInfo?.settlementDate
},
{
title: '付款状态',
title: intl.formatMessage({id: 'balance.fukuanzhuangtai'}),
value: balanceInfo?.statusName
}
]
......@@ -54,12 +55,12 @@ const ViewUniversalPay: React.FC<Iprops> = (props: Iprops) => {
return (
<Modal
width={548}
title="查看付款"
title={intl.formatMessage({id: 'balance.zhakanfukuan'})}
onCancel={handleClose}
visible={visible}
onOk={handleOnOk}
>
<div className={styles.balanceInfoName}>结算方: {balanceInfo?.name}</div>
<div className={styles.balanceInfoName}>{intl.formatMessage({id: 'balance.jiesuanfang'})}: {balanceInfo?.name}</div>
<div className={styles.wrapContainer}>
{
list.map((_item) => {
......
src/pages/balance/platformSettlement/accountReceivable/index.tsx
View file @ 0609b1f7
......@@ -219,7 +219,7 @@ const AccountReceivable = () => {
<Modal
width={548}
title="查看付款凭证"
title={intl.formatMessage({id: 'balance.zhakanfukuanpingzheng'})}
onCancel={viewModalonCancel}
visible={viewVisible && payInfo.payWay === 1}
footer={null}
......
src/pages/balance/settleRules/memberSettle/schema/index.tsx
View file @ 0609b1f7
......@@ -118,9 +118,9 @@ export const addSchema = {
settlementPaymentType: {
type: 'string',
enum: [],
title: '结算支付方式',
title: intl.formatMessage({id: 'balance.jiesuanzhifufangshi'}),
'x-rules': [
{required: true, message: '请填写结算支付方式'},
{required: true, message: intl.formatMessage({id: 'balance.qingtianxiejiesuanzhifufang'})},
]
}
},
......
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