Commit 268c0496 authored by 前端-钟卫鹏's avatar 前端-钟卫鹏

fix: 修改订单表格title文案显示错误/修改订单商品价格原因文案错误

parent 35a9c063
......@@ -437,7 +437,7 @@ export default {
'saleOrder.zongjine': 'Total amount',
'saleOrder.yizhifu': 'paid',
'saleOrder.dingdanhao': 'Order number',
'saleOrder.dingdanzhaiyao': 'Order summary/order time',
'saleOrder.dingdanzhaiyao': 'Order summary',
'saleOrder.caigouhuiyuan': 'purchasing member',
'saleOrder.zongjine/yi': 'Total amount/paid (yuan)',
'saleOrder.zongjine:': 'Total amount:',
......
......@@ -435,7 +435,7 @@ export default {
'saleOrder.zongjine': '총금액',
'saleOrder.yizhifu': '지불됨',
'saleOrder.dingdanhao': '주문 번호',
'saleOrder.dingdanzhaiyao': '주문 요약/주문 시간',
'saleOrder.dingdanzhaiyao': '주문 요약',
'saleOrder.caigouhuiyuan': '구매 회원',
'saleOrder.zongjine/yi': '총 금액/지급(위안)',
'saleOrder.zongjine:': '총 금액:',
......
......@@ -434,7 +434,7 @@ export default {
'saleOrder.zongjine': '总金额',
'saleOrder.yizhifu': '已支付',
'saleOrder.dingdanhao': '订单号',
'saleOrder.dingdanzhaiyao': '订单摘要/下单时间',
'saleOrder.dingdanzhaiyao': '订单摘要',
'saleOrder.caigouhuiyuan': '采购会员',
'saleOrder.zongjine/yi': '总金额/已支付(元)',
'saleOrder.zongjine:': '总金额:',
......
......@@ -299,8 +299,8 @@ export default {
'transaction_components.qingtianxiedanjia': '请填写单价',
'transaction_components.danjiajinxiansanweixiaoshu': '单价仅限三位小数',
'transaction_components.zaicishurunideyuanyin1': '在此输入你的原因, 最多50个汉字',
'transaction_components.quxiaoyuanyin': '取消原因',
'transaction_components.qingshuruquxiaoyuanyin': '请输入取消原因',
'transaction_components.xiugaiyuanyin': '修改原因',
'transaction_components.qingshuruxiugaiyuanyin': '请输入修改原因',
'transaction_components.qingzhengqueshurushuzijin': '请正确输入数字金额',
'transaction_components.yunfeijinxianliangweixiaoshu': '运费仅限两位小数',
'transaction_components.xinzengdingdan': '新增订单',
......
......@@ -363,11 +363,11 @@ export const MoneyTotalBox = ({ dataSource, isEditData }) => {
rows: 4,
placeholder: intl.formatMessage({ id: 'transaction_components.zaicishurunideyuanyin1' })
},
title: intl.formatMessage({ id: 'transaction_components.quxiaoyuanyin' }),
title: intl.formatMessage({ id: 'transaction_components.xiugaiyuanyin' }),
"x-rules": [
{
required: true,
message: intl.formatMessage({ id: 'transaction_components.qingshuruquxiaoyuanyin' })
message: intl.formatMessage({ id: 'transaction_components.qingshuruxiugaiyuanyin' })
},
{
limitByte: true,
......@@ -870,11 +870,11 @@ const SaleOrderProductTable: React.FC<OrderProductTableProps> = (props) => {
rows: 4,
placeholder: intl.formatMessage({ id: 'transaction_components.zaicishurunideyuanyin1' })
},
title: intl.formatMessage({ id: 'transaction_components.quxiaoyuanyin' }),
title: intl.formatMessage({ id: 'transaction_components.xiugaiyuanyin' }),
"x-rules": [
{
required: true,
message: intl.formatMessage({ id: 'transaction_components.qingshuruquxiaoyuanyin' })
message: intl.formatMessage({ id: 'transaction_components.qingshuruxiugaiyuanyin' })
},
{
limitByte: true,
......
......@@ -42,7 +42,7 @@ export const MoneyTotalBox = registerVirtualBox('moneyTotalBox', () => {
const intl = useIntl()
const { form } = useFormSpy({ selector: [['onFieldValueChange', 'detailList']], reducer: v => v })
const data = form.getFieldValue('detailList')
console.log(data, 'data')
const totalCarton = data.reduce((prev, next) => (prev*1000 + (next.carton || 0)*1000)/1000, 0)
const totalWeight = data.reduce((prev, next) => (prev*1000 + (next.weight || 0)*1000)/1000, 0)
const totalVolume = data.reduce((prev, next) => (prev*1000 + (next.volume || 0)*1000)/1000, 0)
......
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