Skip to content

J
jinfa-platform
Commit 8aabd8a8 authored by XieZhiXiong's avatar XieZhiXiong
Browse files
Options

feat: 完成售后退货申请 CN国际化

parent f6f57db0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 356 additions and 182 deletions
src/locales/zh-CN/afterService/common.ts
View file @ 8aabd8a8
......@@ -31,7 +31,12 @@ export default {
'afterService.common.return.anchors.refundList': '退款明细',
'afterService.common.return.anchors.workflowRecord': '流转记录',
'afterService.common.return.refundAmount': '退款金额',
'afterService.common.return.returnBatch': '退货批次',
'afterService.common.return.returnDeliveryNo': '退货发货单号',
'afterService.common.return.products': '退货商品',
'afterService.common.return.refunded': '已退款',
'afterService.common.basicInfo.applyNo': '申请单号',
'afterService.common.basicInfo.orderType': '售后订单类型',
......@@ -43,4 +48,108 @@ export default {
'afterService.common.cancel': '取 消',
'afterService.common.confirm': '确 定',
'afterService.common.add': '新增',
'afterService.common.edit': '编辑',
'afterService.common.verify': '审核',
'afterService.common.commit': '提交',
'afterService.common.promise': '确认',
'afterService.common.checkLogistics': '查看物流单',
'afterService.common.delete': '删除',
'afterService.common.delete.message': '正在删除...',
'afterService.common.delete.tip': '确定要删除吗？',
'afterService.common.delete.okText': '是',
'afterService.common.delete.cancelText': '否',
'afterService.common.commit.message': '正在提交...',
'afterService.common.query.applyNo': '申请单号',
'afterService.common.query.applyNo.placeholder': '搜索',
'afterService.common.query.applyNo.tip': '输入 申请单号 进行搜索',
'afterService.common.query.applyAbstract.placeholder': '申请单摘要',
'afterService.common.query.supplierName.placeholder': '供应会员',
'afterService.common.query.date.placeholder': '单据时间(全部)',
'afterService.common.query.submit': '查询',
'afterService.order.query.column.orderNo': '订单号',
'afterService.order.query.column.digest': '订单摘要',
'afterService.order.query.column.vendorMemberName': '供应会员',
'afterService.order.query.column.createTime': '下单时间',
'afterService.order.query.column.outerStatusName': '订单状态',
'afterService.order.query.column.orderTypeName': '订单类型',
'afterService.order.query.column.contractNo': '合同编号',
'afterService.order.query.column.productNo': '商品ID',
'afterService.order.query.column.materialNo': '物料编号',
'afterService.order.query.column.name': '商品名称',
'afterService.order.query.column.materialName': '物料名称',
'afterService.order.query.column.quotedSpec': '规格',
'afterService.order.query.column.category': '品类',
'afterService.order.query.column.brand': '品牌',
'afterService.order.query.column.unit': '单位',
'afterService.order.query.column.quantity': '订单数量',
'afterService.order.query.column.price': '单价',
'afterService.order.query.column.amount': '金额',
'afterService.order.query.column.returnCount': '已退货数量',
'afterService.order.query.column.returnAmount': '已退款金额',
'afterService.apply.supplierMember.nothing': '请先选择供应会员',
'afterService.apply.orderType.nothing': '请先选择售后订单类型',
'afterService.apply.product.add.normal': '选择退货商品',
'afterService.apply.product.add.material': '选择退货物料',
'afterService.apply.upload.legal': '图片大小超过20M',
'afterService.apply.back': '返回',
'afterService.apply.save': '保存',
'afterService.apply.supplier.columns.memberId': '会员ID',
'afterService.apply.supplier.columns.name': '会员名称',
'afterService.apply.supplier.columns.memberTypeName': '会员类型',
'afterService.apply.supplier.columns.roleName': '会员角色',
'afterService.apply.supplier.columns.levelTag': '会员等级',
'afterService.apply.supplier.name.placeholder': '搜索',
'afterService.apply.supplier.name.tip': '输入 会员名称 进行搜索',
'afterService.apply.basicInfo': '基本信息',
'afterService.apply.applyAbstract': '申请单摘要',
'afterService.apply.applyAbstract.required': '请填写申请单摘要',
'afterService.apply.supplierMember': '供应会员',
'afterService.apply.supplierMember.title': '关联',
'afterService.apply.supplierMember.tip': '请选择对应单据',
'afterService.apply.supplierMember.placeholder': '选择会员',
'afterService.apply.supplierMember.required': '请选择供应会员',
'afterService.apply.orderType': '售后订单类型',
'afterService.apply.orderType.placeholder': '请选择',
'afterService.apply.applyNo': '申请单号',
'afterService.apply.applyTime': '单据时间',
'afterService.apply.outerStatus': '外部状态',
'afterService.apply.innerStatus': '内部状态',
'afterService.apply.product': '单据明细',
'afterService.apply.product.normal': '请选择退货商品',
'afterService.apply.product.material': '请选择退货物料',
'afterService.apply.orderNo': '订单号',
'afterService.apply.productId': '商品ID',
'afterService.apply.productName': '商品名称',
'afterService.apply.category': '品类',
'afterService.apply.brand': '品牌',
'afterService.apply.unit': '单位',
'afterService.apply.materialNo': '物料编号',
'afterService.apply.materialName': '物料名称',
'afterService.apply.quotedSpec': '规格',
'afterService.apply.materialMergeInfo1': '关联报价商品ID、名称、规格、品类、品牌',
'afterService.apply.materialMergeInfo2': '关联投标商品ID、名称、规格、品类、品牌',
'afterService.apply.purchaseCount': '采购数量',
'afterService.apply.purchasePrice': '采购单价',
'afterService.apply.purchaseAmount': '采购金额',
'afterService.apply.payAmount': '已支付金额',
'afterService.apply.returnCount': '退货数量',
'afterService.apply.returnCount.required': '请输入退货数量',
'afterService.apply.refundAmount': '退款金额',
'afterService.apply.refundAmount.required': '请输入退款金额',
'afterService.apply.extra': '相关附件',
'afterService.apply.proofFileList': '附件',
'afterService.apply.proofFileList.required': '请上传附件',
'afterService.apply.proofFileList.description': '一次上传一个文件，每个附件大小不能超过20M',
'afterService.apply.address': '退货收货地址',
'afterService.apply.deliveryType': '配送方式',
'afterService.apply.deliveryType.placeholder': '请选择',
'afterService.apply.deliveryType.required': '请选择配送方式',
'afterService.apply.deliveryAddress': '退货发货地址',
'afterService.apply.deliveryAddress.required': '请选择退货发货地址',
'afterService.apply.pickupAddress': '退货自提地址',
'afterService.apply.pickupAddress.required': '请选择退货自提地址',
}
\ No newline at end of file
src/locales/zh-CN/afterService/returnApplication.ts
View file @ 8aabd8a8
export default {
'returnApplication.detailInfo.productColumns.orderNo': '订单号',
'returnApplication.returnPrAddDeliver.verify': '订单号',
'returnApplication.returnPrAddDeliver.verify.title': '确认审核操作',
'returnApplication.returnPrAddDeliver.verify.content': '是否确认审核退货发货单号为{returnDeliveryNo}的退货发货单？',
'returnApplication.returnPrConfirmBack.back': '确认退货回单',
'returnApplication.returnPrConfirmFinish.finish': '确认售后完成',
'returnApplication.returnPrConfirmResult.allRefund': '确认本单所有退款到账',
'returnApplication.returnPrConfirmResult.allRefund.tip': '提示',
'returnApplication.returnPrConfirmResult.allRefund.content': '是否本单所有退款确认到账？',
'returnApplication.returnPrDeliver.allRefund.deliver': '退货发货',
'returnApplication.returnPrSubmit.add': '新建退货申请单',
'returnApplication.returnPrSubmit.edit': '编辑退货申请单',
'returnApplication.returnPrSubmit.check': '查看退货申请单',
}
\ No newline at end of file
src/pages/afterService/returnApplication/components/DetailInfo/index.tsx
View file @ 8aabd8a8
......@@ -219,11 +219,11 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
descriptions={[
{
title: `${intl.formatMessage({ id: 'afterService.common.productColumns.payAmount2' }, { default: '已支付金额' })}:`,
value: `¥${text}`,
value: `${intl.formatMessage({ id: 'common.money' }, { default: '¥' })}${text}`,
},
{
title: `${intl.formatMessage({ id: 'afterService.common.productColumns.purchaseAmount' }, { default: '采购金额' })}:`,
value: `¥${record.purchaseAmount}`,
value: `${intl.formatMessage({ id: 'common.money' }, { default: '¥' })}${record.purchaseAmount}`,
},
]}
percent={(text / record.purchaseAmount) * 100}
......@@ -233,7 +233,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
title: intl.formatMessage({ id: 'afterService.common.productColumns.purchaseAmount' }, { default: '采购金额' }),
dataIndex: 'purchaseAmount',
align: 'center',
render: text => `¥${text}`,
render: text => `${intl.formatMessage({ id: 'common.money' }, { default: '¥' })}${text}`,
}
,
{
......
src/pages/afterService/returnApplication/returnPrAddDeliver/addDeliverBill.tsx
View file @ 8aabd8a8
......@@ -7,7 +7,7 @@
*/
import React, { useState } from 'react';
import { FormEffectHooks } from '@formily/antd';
import { history, Prompt } from 'umi';
import { history, Prompt, useIntl } from 'umi';
import moment from 'moment';
import { DOC_TYPE_RETURN_INVOICE } from '@/constants/commodity';
import BillsFormPage, { RelatedInfoDataType, BillSubmitValuesType } from '@/pages/transaction/stockSellStorage/bills/components/BillsFormPage';
......@@ -24,6 +24,8 @@ const ReturnAddDeliverBill = () => {
const [unsaved, setUnsaved] = useState(false);
const [submitLoading, setSubmitLoading] = useState(false);
const intl = useIntl();
const fetchRelatedInfo = (): Promise<RelatedInfoDataType> => {
return new Promise((resolve, reject) => {
getAsReturnGoodsGetDetailByConsumer({
......@@ -104,7 +106,7 @@ const ReturnAddDeliverBill = () => {
});
}}
/>
<Prompt when={unsaved} message="您还有未保存的内容，是否确定要离开？" />
<Prompt when={unsaved} message={intl.formatMessage({ id: 'common.tip.save.confirm' }, { default: '您还有未保存的内容，是否确定要离开？' })} />
</>
);
};
......
src/pages/afterService/returnApplication/returnPrAddDeliver/index.tsx
View file @ 8aabd8a8
......@@ -10,7 +10,7 @@ import { Card, Badge, Button, Modal } from 'antd';
import {
ExclamationCircleOutlined,
} from '@ant-design/icons';
import { history, Link } from 'umi';
import { history, Link, useIntl } from 'umi';
import { StandardTable } from 'god';
import moment from 'moment';
import { ColumnType } from 'antd/lib/table/interface';
......@@ -40,11 +40,13 @@ const formActions = createFormActions();
const ReturnPrAddDeliver: React.FC = () => {
const ref = useRef<any>({});
const intl = useIntl();
const handleVerify = record => {
confirm({
title: '确认审核操作',
title: intl.formatMessage({ id: 'returnApplication.returnPrAddDeliver.verify.title' }, { default: '确认审核操作' }),
icon: <ExclamationCircleOutlined />,
content: `是否确认审核退货发货单号为${record.returnDeliveryNo}的退货发货单？`,
content: intl.formatMessage({ id: 'returnApplication.returnPrAddDeliver.verify.content' }, { returnDeliveryNo: record.returnDeliveryNo }),
onOk() {
return new Promise((resolve, reject) => {
postAsReturnGoodsVerifyReturnDeliveryGoods({
......@@ -64,7 +66,7 @@ const ReturnPrAddDeliver: React.FC = () => {
const defaultColumns: ColumnType<any>[] = [
{
title: '申请单号',
title: intl.formatMessage({ id: 'afterService.common.basicInfo.applyNo' }, { default: '申请单号' }),
dataIndex: 'applyNo',
align: 'center',
render: (text, record) => (
......@@ -78,33 +80,33 @@ const ReturnPrAddDeliver: React.FC = () => {
),
},
{
title: '申请单摘要',
title: intl.formatMessage({ id: 'afterService.common.basicInfo.applyAbstract' }, { default: '申请单摘要' }),
dataIndex: 'applyAbstract',
align: 'center',
ellipsis: true,
},
{
title: '供应会员',
title: intl.formatMessage({ id: 'afterService.common.basicInfo.supplierName' }, { default: '供应会员' }),
dataIndex: 'supplierName',
align: 'center',
},
{
title: '退款金额',
title: intl.formatMessage({ id: 'afterService.common.return.refundAmount' }, { default: '退款金额' }),
dataIndex: 'refundAmount',
align: 'center',
},
{
title: '单据时间',
title: intl.formatMessage({ id: 'afterService.common.basicInfo.applyTime' }, { default: '单据时间' }),
dataIndex: 'applyTime',
align: 'center',
},
{
title: '退货批次',
title: intl.formatMessage({ id: 'afterService.common.return.returnBatch' }, { default: '退货批次' }),
dataIndex: 'returnBatch',
align: 'center',
},
{
title: '退货发货单号',
title: intl.formatMessage({ id: 'afterService.common.return.returnDeliveryNo' }, { default: '退货发货单号' }),
dataIndex: 'returnDeliveryNo',
align: 'center',
render: (text, record) => (
......@@ -116,7 +118,7 @@ const ReturnPrAddDeliver: React.FC = () => {
),
},
{
title: '外部状态',
title: intl.formatMessage({ id: 'afterService.common.basicInfo.outerStatus' }, { default: '外部状态' }),
dataIndex: 'outerStatusName',
align: 'center',
render: (text, record) => (
......@@ -124,13 +126,13 @@ const ReturnPrAddDeliver: React.FC = () => {
),
},
{
title: '内部状态',
title: intl.formatMessage({ id: 'afterService.common.basicInfo.innerStatus' }, { default: '内部状态' }),
dataIndex: 'innerStatusName',
align: 'center',
render: (text, record) => <Badge color={RETURN_INNER_STATUS_BADGE_MAP[record.innerStatus] || '#606266'} text={text} />,
},
{
title: '操作',
title: intl.formatMessage({ id: 'common.table.action' }),
dataIndex: 'option',
align: 'center',
render: (text, record) => (
......@@ -143,7 +145,7 @@ const ReturnPrAddDeliver: React.FC = () => {
history.push(`/memberCenter/afterService/returnApplication/returnPrAddDeliver/add?applyId=${record.returnId}`)
}
>
新增
{intl.formatMessage({ id: 'afterService.common.add' }, { default: '新增' })}
</Button>
)}
{record.innerStatus === RETURN_INNER_STATUS_UNREVIEWED_RETURN_DELIVERY && (
......@@ -151,7 +153,7 @@ const ReturnPrAddDeliver: React.FC = () => {
type="link"
onClick={() => handleVerify(record)}
>
审核
{intl.formatMessage({ id: 'afterService.common.verify' }, { default: '审核' })}
</Button>
)}
</>
......
src/pages/afterService/returnApplication/returnPrAddDeliver/schema/index.ts
View file @ 8aabd8a8
......@@ -6,9 +6,12 @@
* @Description:
*/
import { ISchema } from '@formily/antd';
import { getIntl } from 'umi';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { UPLOAD_TYPE } from '@/constants';
const intl = getIntl();
export const listSearchSchema: ISchema = {
type: 'object',
properties: {
......@@ -20,9 +23,9 @@ export const listSearchSchema: ISchema = {
type: 'string',
'x-component': 'Search',
'x-component-props': {
placeholder: '搜索',
placeholder: intl.formatMessage({ id: 'afterService.common.query.applyNo.placeholder' }, { default: '搜索' }),
align: 'flex-left',
tip: '输入 申请单号 进行搜索',
tip: intl.formatMessage({ id: 'afterService.common.query.applyNo.tip' }, { default: '输入 申请单号 进行搜索' }),
},
},
[FORM_FILTER_PATH]: {
......@@ -38,14 +41,14 @@ export const listSearchSchema: ISchema = {
applyAbstract: {
type: 'string',
'x-component-props': {
placeholder: '申请单摘要',
placeholder: intl.formatMessage({ id: 'afterService.common.query.applyAbstract.placeholder' }, { default: '申请单摘要' }),
allowClear: true,
},
},
supplierName: {
type: 'string',
'x-component-props': {
placeholder: '供应会员',
placeholder: intl.formatMessage({ id: 'afterService.common.query.supplierName.placeholder' }, { default: '供应会员' }),
allowClear: true,
},
},
......@@ -54,7 +57,7 @@ export const listSearchSchema: ISchema = {
default: '',
'x-component': 'dateSelect',
'x-component-props': {
placeholder: '单据时间(全部)',
placeholder: intl.formatMessage({ id: 'afterService.common.query.date.placeholder' }, { default: '单据时间(全部)' }),
allowClear: true,
},
},
......@@ -64,7 +67,7 @@ export const listSearchSchema: ISchema = {
span: 1,
},
'x-component-props': {
children: '查询',
children: intl.formatMessage({ id: 'afterService.common.query.submit' }, { default: '查询' }),
},
},
},
......
src/pages/afterService/returnApplication/returnPrAddLogistics/index.tsx
View file @ 8aabd8a8
......@@ -10,7 +10,7 @@ import { Card, Badge, Progress, Button } from 'antd';
import {
ClockCircleOutlined,
} from '@ant-design/icons';
import { history, Link } from 'umi';
import { history, Link, useIntl } from 'umi';
import { StandardTable } from 'god';
import moment from 'moment';
import { ColumnType } from 'antd/lib/table/interface';
......@@ -39,9 +39,11 @@ const formActions = createFormActions();
const ReturnPrAddLogistics: React.FC = () => {
const ref = useRef<any>({});
const intl = useIntl();
const defaultColumns: ColumnType<any>[] = [
{
title: '申请单号',
title: intl.formatMessage({ id: 'afterService.common.basicInfo.applyNo' }, { default: '申请单号' }),
dataIndex: 'applyNo',
align: 'center',
render: (text, record) => (
......@@ -55,33 +57,33 @@ const ReturnPrAddLogistics: React.FC = () => {
),
},
{
title: '申请单摘要',
title: intl.formatMessage({ id: 'afterService.common.basicInfo.applyAbstract' }, { default: '申请单摘要' }),
dataIndex: 'applyAbstract',
align: 'center',
ellipsis: true,
},
{
title: '供应会员',
title: intl.formatMessage({ id: 'afterService.common.basicInfo.supplierName' }, { default: '供应会员' }),
dataIndex: 'supplierName',
align: 'center',
},
{
title: '退款金额',
title: intl.formatMessage({ id: 'afterService.common.return.refundAmount' }, { default: '退款金额' }),
dataIndex: 'refundAmount',
align: 'center',
},
{
title: '单据时间',
title: intl.formatMessage({ id: 'afterService.common.basicInfo.applyTime' }, { default: '单据时间' }),
dataIndex: 'applyTime',
align: 'center',
},
{
title: '退货批次',
title: intl.formatMessage({ id: 'afterService.common.return.returnBatch' }, { default: '退货批次' }),
dataIndex: 'returnBatch',
align: 'center',
},
{
title: '退货发货单号',
title: intl.formatMessage({ id: 'afterService.common.return.returnDeliveryNo' }, { default: '退货发货单号' }),
dataIndex: 'returnDeliveryNo',
align: 'center',
render: (text, record) => (
......@@ -93,7 +95,7 @@ const ReturnPrAddLogistics: React.FC = () => {
),
},
{
title: '外部状态',
title: intl.formatMessage({ id: 'afterService.common.basicInfo.outerStatus' }, { default: '外部状态' }),
dataIndex: 'outerStatusName',
align: 'center',
render: (text, record) => (
......@@ -101,13 +103,13 @@ const ReturnPrAddLogistics: React.FC = () => {
),
},
{
title: '内部状态',
title: intl.formatMessage({ id: 'afterService.common.basicInfo.innerStatus' }, { default: '内部状态' }),
dataIndex: 'innerStatusName',
align: 'center',
render: (text, record) => <Badge color={RETURN_INNER_STATUS_BADGE_MAP[record.innerStatus] || '#606266'} text={text} />,
},
{
title: '操作',
title: intl.formatMessage({ id: 'common.table.action' }),
dataIndex: 'option',
align: 'center',
render: (text, record) => (
......@@ -120,7 +122,7 @@ const ReturnPrAddLogistics: React.FC = () => {
history.push(`/memberCenter/logisticsAbility/logisticsBillSubmit/waitSbumitLogisticsBill/add?createType=${6}&id=${record.returnId}`)
}
>
新增
{intl.formatMessage({ id: 'afterService.common.add' }, { default: '新增' })}
</Button>
)}
{record.innerStatus === RETURN_INNER_STATUS_CONSUMER_UNCONFIRMED_LOGISTICS && (
......@@ -131,7 +133,7 @@ const ReturnPrAddLogistics: React.FC = () => {
history.push(`/memberCenter/logisticsAbility/logisticsBillSubmit/logisticsBillQuery/preview?id=${record.returnLogisticsId}`)
}
>
查看物流单
{intl.formatMessage({ id: 'afterService.common.checkLogistics' }, { default: '查看物流单' })}
</Button>
)}
{record.innerStatus === RETURN_INNER_STATUS_UNACCEPTED_LOGISTICS && (
......@@ -142,7 +144,7 @@ const ReturnPrAddLogistics: React.FC = () => {
history.push(`/memberCenter/logisticsAbility/logisticsBillSubmit/waitSbumitLogisticsBill/edit?id=${record.returnLogisticsId}`)
}
>
编辑
{intl.formatMessage({ id: 'afterService.common.edit' }, { default: '编辑' })}
</Button>
)}
</>
......
src/pages/afterService/returnApplication/returnPrAddLogistics/schema/index.ts
View file @ 8aabd8a8
......@@ -6,9 +6,12 @@
* @Description:
*/
import { ISchema } from '@formily/antd';
import { getIntl } from 'umi';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { UPLOAD_TYPE } from '@/constants';
const intl = getIntl();
export const listSearchSchema: ISchema = {
type: 'object',
properties: {
......@@ -20,9 +23,9 @@ export const listSearchSchema: ISchema = {
type: 'string',
'x-component': 'Search',
'x-component-props': {
placeholder: '搜索',
placeholder: intl.formatMessage({ id: 'afterService.common.query.applyNo.placeholder' }, { default: '搜索' }),
align: 'flex-left',
tip: '输入 申请单号 进行搜索',
tip: intl.formatMessage({ id: 'afterService.common.query.applyNo.tip' }, { default: '输入 申请单号 进行搜索' }),
},
},
[FORM_FILTER_PATH]: {
......@@ -38,14 +41,14 @@ export const listSearchSchema: ISchema = {
applyAbstract: {
type: 'string',
'x-component-props': {
placeholder: '申请单摘要',
placeholder: intl.formatMessage({ id: 'afterService.common.query.applyAbstract.placeholder' }, { default: '申请单摘要' }),
allowClear: true,
},
},
supplierName: {
type: 'string',
'x-component-props': {
placeholder: '供应会员',
placeholder: intl.formatMessage({ id: 'afterService.common.query.supplierName.placeholder' }, { default: '供应会员' }),
allowClear: true,
},
},
......@@ -54,7 +57,7 @@ export const listSearchSchema: ISchema = {
default: '',
'x-component': 'dateSelect',
'x-component-props': {
placeholder: '单据时间(全部)',
placeholder: intl.formatMessage({ id: 'afterService.common.query.date.placeholder' }, { default: '单据时间(全部)' }),
allowClear: true,
},
},
......@@ -64,7 +67,7 @@ export const listSearchSchema: ISchema = {
span: 1,
},
'x-component-props': {
children: '查询',
children: intl.formatMessage({ id: 'afterService.common.query.submit' }, { default: '查询' }),
},
},
},
......
src/pages/afterService/returnApplication/returnPrConfirmBack/index.tsx
View file @ 8aabd8a8
......@@ -11,7 +11,7 @@ import {
ClockCircleOutlined,
ExclamationCircleOutlined,
} from '@ant-design/icons';
import { history, Link } from 'umi';
import { history, Link, useIntl } from 'umi';
import { StandardTable } from 'god';
import moment from 'moment';
import { ColumnType } from 'antd/lib/table/interface';
......@@ -37,9 +37,11 @@ const formActions = createFormActions();
const ReturnPrConfirmBack: React.FC = () => {
const ref = useRef<any>({});
const intl = useIntl();
const defaultColumns: ColumnType<any>[] = [
{
title: '申请单号',
title: intl.formatMessage({ id: 'afterService.common.basicInfo.applyNo' }, { default: '申请单号' }),
dataIndex: 'applyNo',
align: 'center',
render: (text, record) => (
......@@ -53,33 +55,33 @@ const ReturnPrConfirmBack: React.FC = () => {
),
},
{
title: '申请单摘要',
title: intl.formatMessage({ id: 'afterService.common.basicInfo.applyAbstract' }, { default: '申请单摘要' }),
dataIndex: 'applyAbstract',
align: 'center',
ellipsis: true,
},
{
title: '供应会员',
dataIndex: 'applyAbstract',
title: intl.formatMessage({ id: 'afterService.common.basicInfo.supplierName' }, { default: '供应会员' }),
dataIndex: 'supplierName',
align: 'center',
},
{
title: '退款金额',
title: intl.formatMessage({ id: 'afterService.common.return.refundAmount' }, { default: '退款金额' }),
dataIndex: 'refundAmount',
align: 'center',
},
{
title: '单据时间',
title: intl.formatMessage({ id: 'afterService.common.basicInfo.applyTime' }, { default: '单据时间' }),
dataIndex: 'applyTime',
align: 'center',
},
{
title: '退货批次',
title: intl.formatMessage({ id: 'afterService.common.return.returnBatch' }, { default: '退货批次' }),
dataIndex: 'returnBatch',
align: 'center',
},
{
title: '退货发货单号',
title: intl.formatMessage({ id: 'afterService.common.return.returnDeliveryNo' }, { default: '退货发货单号' }),
dataIndex: 'returnDeliveryNo',
align: 'center',
render: (text, record) => (
......@@ -91,7 +93,7 @@ const ReturnPrConfirmBack: React.FC = () => {
),
},
{
title: '外部状态',
title: intl.formatMessage({ id: 'afterService.common.basicInfo.outerStatus' }, { default: '外部状态' }),
dataIndex: 'outerStatusName',
align: 'center',
render: (text, record) => (
......@@ -99,13 +101,13 @@ const ReturnPrConfirmBack: React.FC = () => {
),
},
{
title: '内部状态',
title: intl.formatMessage({ id: 'afterService.common.basicInfo.innerStatus' }, { default: '内部状态' }),
dataIndex: 'innerStatusName',
align: 'center',
render: (text, record) => <Badge color={RETURN_INNER_STATUS_BADGE_MAP[record.innerStatus] || '#606266'} text={text} />,
},
{
title: '操作',
title: intl.formatMessage({ id: 'common.table.action' }),
dataIndex: 'option',
align: 'center',
render: (text, record) => (
......@@ -114,7 +116,7 @@ const ReturnPrConfirmBack: React.FC = () => {
type="link"
onClick={() => history.push(`/memberCenter/afterService/returnApplication/returnPrConfirmBack/verify?id=${record.returnId}`)}
>
确认退货回单
{intl.formatMessage({ id: 'returnApplication.returnPrConfirmBack.back' }, { default: '确认退货回单' })}
</Button>
</>
),
......
src/pages/afterService/returnApplication/returnPrConfirmBack/schema/index.ts
View file @ 8aabd8a8
......@@ -6,9 +6,12 @@
* @Description:
*/
import { ISchema } from '@formily/antd';
import { getIntl } from 'umi';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { UPLOAD_TYPE } from '@/constants';
const intl = getIntl();
export const listSearchSchema: ISchema = {
type: 'object',
properties: {
......@@ -20,9 +23,9 @@ export const listSearchSchema: ISchema = {
type: 'string',
'x-component': 'Search',
'x-component-props': {
placeholder: '搜索',
placeholder: intl.formatMessage({ id: 'afterService.common.query.applyNo.placeholder' }, { default: '搜索' }),
align: 'flex-left',
tip: '输入 申请单号 进行搜索',
tip: intl.formatMessage({ id: 'afterService.common.query.applyNo.tip' }, { default: '输入 申请单号 进行搜索' }),
},
},
[FORM_FILTER_PATH]: {
......@@ -38,14 +41,14 @@ export const listSearchSchema: ISchema = {
applyAbstract: {
type: 'string',
'x-component-props': {
placeholder: '申请单摘要',
placeholder: intl.formatMessage({ id: 'afterService.common.query.applyAbstract.placeholder' }, { default: '申请单摘要' }),
allowClear: true,
},
},
supplierName: {
type: 'string',
'x-component-props': {
placeholder: '供应会员',
placeholder: intl.formatMessage({ id: 'afterService.common.query.supplierName.placeholder' }, { default: '供应会员' }),
allowClear: true,
},
},
......@@ -54,7 +57,7 @@ export const listSearchSchema: ISchema = {
default: '',
'x-component': 'dateSelect',
'x-component-props': {
placeholder: '单据时间(全部)',
placeholder: intl.formatMessage({ id: 'afterService.common.query.date.placeholder' }, { default: '单据时间(全部)' }),
allowClear: true,
},
},
......@@ -64,7 +67,7 @@ export const listSearchSchema: ISchema = {
span: 1,
},
'x-component-props': {
children: '查询',
children: intl.formatMessage({ id: 'afterService.common.query.submit' }, { default: '查询' }),
},
},
},
......
src/pages/afterService/returnApplication/returnPrConfirmFinish/index.tsx
View file @ 8aabd8a8
......@@ -11,7 +11,7 @@ import {
ClockCircleOutlined,
ExclamationCircleOutlined,
} from '@ant-design/icons';
import { history } from 'umi';
import { history, useIntl } from 'umi';
import { StandardTable } from 'god';
import moment from 'moment';
import { ColumnType } from 'antd/lib/table/interface';
......@@ -37,9 +37,11 @@ const formActions = createFormActions();
const ReturnPrConfirmFinish: React.FC = () => {
const ref = useRef<any>({});
const intl = useIntl();
const defaultColumns: ColumnType<any>[] = [
{
title: '申请单号',
title: intl.formatMessage({ id: 'afterService.common.basicInfo.applyNo' }, { default: '申请单号' }),
dataIndex: 'applyNo',
align: 'center',
render: (text, record) => (
......@@ -53,28 +55,28 @@ const ReturnPrConfirmFinish: React.FC = () => {
),
},
{
title: '申请单摘要',
title: intl.formatMessage({ id: 'afterService.common.basicInfo.applyAbstract' }, { default: '申请单摘要' }),
dataIndex: 'applyAbstract',
align: 'center',
ellipsis: true,
},
{
title: '供应会员',
title: intl.formatMessage({ id: 'afterService.common.basicInfo.supplierName' }, { default: '供应会员' }),
dataIndex: 'supplierName',
align: 'center',
},
{
title: '退款金额',
title: intl.formatMessage({ id: 'afterService.common.return.refundAmount' }, { default: '退款金额' }),
dataIndex: 'refundAmount',
align: 'center',
},
{
title: '单据时间',
title: intl.formatMessage({ id: 'afterService.common.basicInfo.applyTime' }, { default: '单据时间' }),
dataIndex: 'applyTime',
align: 'center',
},
{
title: '外部状态',
title: intl.formatMessage({ id: 'afterService.common.basicInfo.outerStatus' }, { default: '外部状态' }),
dataIndex: 'outerStatusName',
align: 'center',
render: (text, record) => (
......@@ -82,7 +84,7 @@ const ReturnPrConfirmFinish: React.FC = () => {
),
},
{
title: '内部状态',
title: intl.formatMessage({ id: 'afterService.common.basicInfo.innerStatus' }, { default: '内部状态' }),
dataIndex: 'innerStatusName',
align: 'center',
render: (text, record) => <Badge color={RETURN_INNER_STATUS_BADGE_MAP[record.innerStatus] || '#606266'} text={text} />,
......@@ -97,7 +99,7 @@ const ReturnPrConfirmFinish: React.FC = () => {
type="link"
onClick={() => history.push(`/memberCenter/afterService/returnApplication/returnPrConfirmFinish/verify?id=${record.returnId}`)}
>
确认售后完成
{intl.formatMessage({ id: 'returnApplication.returnPrConfirmFinish.finish' }, { default: '确认售后完成' })}
</Button>
</>
),
......
src/pages/afterService/returnApplication/returnPrConfirmFinish/schema/index.ts
View file @ 8aabd8a8
......@@ -6,9 +6,12 @@
* @Description:
*/
import { ISchema } from '@formily/antd';
import { getIntl } from 'umi';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { UPLOAD_TYPE } from '@/constants';
const intl = getIntl();
export const listSearchSchema: ISchema = {
type: 'object',
properties: {
......@@ -20,9 +23,9 @@ export const listSearchSchema: ISchema = {
type: 'string',
'x-component': 'Search',
'x-component-props': {
placeholder: '搜索',
placeholder: intl.formatMessage({ id: 'afterService.common.query.applyNo.placeholder' }, { default: '搜索' }),
align: 'flex-left',
tip: '输入 申请单号 进行搜索',
tip: intl.formatMessage({ id: 'afterService.common.query.applyNo.tip' }, { default: '输入 申请单号 进行搜索' }),
},
},
[FORM_FILTER_PATH]: {
......@@ -38,14 +41,14 @@ export const listSearchSchema: ISchema = {
applyAbstract: {
type: 'string',
'x-component-props': {
placeholder: '申请单摘要',
placeholder: intl.formatMessage({ id: 'afterService.common.query.applyAbstract.placeholder' }, { default: '申请单摘要' }),
allowClear: true,
},
},
supplierName: {
type: 'string',
'x-component-props': {
placeholder: '供应会员',
placeholder: intl.formatMessage({ id: 'afterService.common.query.supplierName.placeholder' }, { default: '供应会员' }),
allowClear: true,
},
},
......@@ -54,7 +57,7 @@ export const listSearchSchema: ISchema = {
default: '',
'x-component': 'dateSelect',
'x-component-props': {
placeholder: '单据时间(全部)',
placeholder: intl.formatMessage({ id: 'afterService.common.query.date.placeholder' }, { default: '单据时间(全部)' }),
allowClear: true,
},
},
......@@ -64,7 +67,7 @@ export const listSearchSchema: ISchema = {
span: 1,
},
'x-component-props': {
children: '查询',
children: intl.formatMessage({ id: 'afterService.common.query.submit' }, { default: '查询' }),
},
},
},
......
src/pages/afterService/returnApplication/returnPrConfirmFinish/verify.tsx
View file @ 8aabd8a8
......@@ -7,7 +7,7 @@
*/
import React, { useState } from 'react';
import { Button } from 'antd';
import { history } from 'umi';
import { history, useIntl } from 'umi';
import { postAsReturnGoodsConfirmComplete } from '@/services/AfterServiceV2Api';
import { FormOutlined } from '@ant-design/icons';
import { usePageStatus } from '@/hooks/usePageStatus';
......@@ -19,6 +19,8 @@ const ReturnPrConfirmFinishVerify: React.FC = () => {
const [visible, setVisible] = useState(false);
const [confirmLoading, setConfirmLoading] = useState(false);
const intl = useIntl();
const handleSubmit = values => {
if (!id) {
return;
......@@ -46,7 +48,7 @@ const ReturnPrConfirmFinishVerify: React.FC = () => {
icon={<FormOutlined />}
onClick={() => setVisible(true)}
>
提交
{intl.formatMessage({ id: 'afterService.common.commit' }, { default: '提交' })}
</Button>
)}
target="/memberCenter/afterService/returnApplication/returnPrConfirmFinish"
......
src/pages/afterService/returnApplication/returnPrConfirmResult/index.tsx
View file @ 8aabd8a8
......@@ -11,7 +11,7 @@ import {
ClockCircleOutlined,
ExclamationCircleOutlined,
} from '@ant-design/icons';
import { history } from 'umi';
import { history, useIntl } from 'umi';
import { StandardTable } from 'god';
import moment from 'moment';
import { ColumnType } from 'antd/lib/table/interface';
......@@ -37,9 +37,11 @@ const formActions = createFormActions();
const ReturnPrConfirmResult: React.FC = () => {
const ref = useRef<any>({});
const intl = useIntl();
const defaultColumns: ColumnType<any>[] = [
{
title: '申请单号',
title: intl.formatMessage({ id: 'afterService.common.basicInfo.applyNo' }, { default: '申请单号' }),
dataIndex: 'applyNo',
align: 'center',
render: (text, record) => (
......@@ -53,33 +55,33 @@ const ReturnPrConfirmResult: React.FC = () => {
),
},
{
title: '申请单摘要',
title: intl.formatMessage({ id: 'afterService.common.basicInfo.applyAbstract' }, { default: '申请单摘要' }),
dataIndex: 'applyAbstract',
align: 'center',
ellipsis: true,
},
{
title: '供应会员',
title: intl.formatMessage({ id: 'afterService.common.basicInfo.supplierName' }, { default: '供应会员' }),
dataIndex: 'supplierName',
align: 'center',
},
{
title: '退款金额',
title: intl.formatMessage({ id: 'afterService.common.return.refundAmount' }, { default: '退款金额' }),
dataIndex: 'refundAmount',
align: 'center',
},
{
title: '单据时间',
title: intl.formatMessage({ id: 'afterService.common.basicInfo.applyTime' }, { default: '单据时间' }),
dataIndex: 'applyTime',
align: 'center',
},
{
title: '已退款',
title: intl.formatMessage({ id: 'afterService.common.return.refunded' }, { default: '已退款' }),
dataIndex: 'refunded',
align: 'center',
},
{
title: '外部状态',
title: intl.formatMessage({ id: 'afterService.common.basicInfo.outerStatus' }, { default: '外部状态' }),
dataIndex: 'outerStatusName',
align: 'center',
render: (text, record) => (
......@@ -87,13 +89,13 @@ const ReturnPrConfirmResult: React.FC = () => {
),
},
{
title: '内部状态',
title: intl.formatMessage({ id: 'afterService.common.basicInfo.innerStatus' }, { default: '内部状态' }),
dataIndex: 'innerStatusName',
align: 'center',
render: (text, record) => <Badge color={RETURN_INNER_STATUS_BADGE_MAP[record.innerStatus] || '#606266'} text={text} />,
},
{
title: '操作',
title: intl.formatMessage({ id: 'common.table.action' }),
dataIndex: 'option',
align: 'center',
render: (text, record) => (
......@@ -102,7 +104,7 @@ const ReturnPrConfirmResult: React.FC = () => {
type="link"
onClick={() => history.push(`/memberCenter/afterService/returnApplication/returnPrConfirmResult/verify?id=${record.returnId}`)}
>
确认
{intl.formatMessage({ id: 'afterService.common.promise' }, { default: '确认' })}
</Button>
</>
),
......
src/pages/afterService/returnApplication/returnPrConfirmResult/schema/index.ts
View file @ 8aabd8a8
......@@ -6,9 +6,12 @@
* @Description:
*/
import { ISchema } from '@formily/antd';
import { getIntl } from 'umi';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { UPLOAD_TYPE } from '@/constants';
const intl = getIntl();
export const listSearchSchema: ISchema = {
type: 'object',
properties: {
......@@ -20,9 +23,9 @@ export const listSearchSchema: ISchema = {
type: 'string',
'x-component': 'Search',
'x-component-props': {
placeholder: '搜索',
placeholder: intl.formatMessage({ id: 'afterService.common.query.applyNo.placeholder' }, { default: '搜索' }),
align: 'flex-left',
tip: '输入 申请单号 进行搜索',
tip: intl.formatMessage({ id: 'afterService.common.query.applyNo.tip' }, { default: '输入 申请单号 进行搜索' }),
},
},
[FORM_FILTER_PATH]: {
......@@ -38,14 +41,14 @@ export const listSearchSchema: ISchema = {
applyAbstract: {
type: 'string',
'x-component-props': {
placeholder: '申请单摘要',
placeholder: intl.formatMessage({ id: 'afterService.common.query.applyAbstract.placeholder' }, { default: '申请单摘要' }),
allowClear: true,
},
},
supplierName: {
type: 'string',
'x-component-props': {
placeholder: '供应会员',
placeholder: intl.formatMessage({ id: 'afterService.common.query.supplierName.placeholder' }, { default: '供应会员' }),
allowClear: true,
},
},
......@@ -54,7 +57,7 @@ export const listSearchSchema: ISchema = {
default: '',
'x-component': 'dateSelect',
'x-component-props': {
placeholder: '单据时间(全部)',
placeholder: intl.formatMessage({ id: 'afterService.common.query.date.placeholder' }, { default: '单据时间(全部)' }),
allowClear: true,
},
},
......@@ -64,7 +67,7 @@ export const listSearchSchema: ISchema = {
span: 1,
},
'x-component-props': {
children: '查询',
children: intl.formatMessage({ id: 'afterService.common.query.submit' }, { default: '查询' }),
},
},
},
......
src/pages/afterService/returnApplication/returnPrConfirmResult/verify.tsx
View file @ 8aabd8a8
......@@ -7,7 +7,7 @@
*/
import React from 'react';
import { Button, Modal } from 'antd';
import { history } from 'umi';
import { history, useIntl } from 'umi';
import { postAsReturnGoodsConfirmAllRefund } from '@/services/AfterServiceV2Api';
import { FormOutlined, ExclamationCircleOutlined } from '@ant-design/icons';
import { usePageStatus } from '@/hooks/usePageStatus';
......@@ -19,14 +19,16 @@ const { confirm } = Modal;
const ReturnPrConfirmResultVerify: React.FC = () => {
const { id } = usePageStatus();
const intl = useIntl();
const handleSubmit = values => {
if (!id) {
return;
}
confirm({
title: '提示',
title: intl.formatMessage({ id: 'returnApplication.returnPrConfirmResult.allRefund.tip' }, { default: '提示' }),
icon: <ExclamationCircleOutlined />,
content: `是否本单所有退款确认到账？`,
content: intl.formatMessage({ id: 'returnApplication.returnPrConfirmResult.allRefund.content' }, { default: '是否本单所有退款确认到账？' }),
onOk() {
return postAsReturnGoodsConfirmAllRefund({
dataId: +id,
......@@ -58,7 +60,7 @@ const ReturnPrConfirmResultVerify: React.FC = () => {
onClick={handleSubmit}
key="confirmAllRefunded"
>
确认本单所有退款到账
{intl.formatMessage({ id: 'returnApplication.returnPrConfirmResult.allRefund' }, { default: '确认本单所有退款到账' })}
</Button>
) : null,
]
......
src/pages/afterService/returnApplication/returnPrDeliver/index.tsx
View file @ 8aabd8a8
......@@ -11,7 +11,7 @@ import {
ClockCircleOutlined,
ExclamationCircleOutlined,
} from '@ant-design/icons';
import { history, Link } from 'umi';
import { history, Link, useIntl } from 'umi';
import { StandardTable } from 'god';
import moment from 'moment';
import { ColumnType } from 'antd/lib/table/interface';
......@@ -37,9 +37,11 @@ const formActions = createFormActions();
const ReturnPrDeliver: React.FC = () => {
const ref = useRef<any>({});
const intl = useIntl();
const defaultColumns: ColumnType<any>[] = [
{
title: '申请单号',
title: intl.formatMessage({ id: 'afterService.common.basicInfo.applyNo' }, { default: '申请单号' }),
dataIndex: 'applyNo',
align: 'center',
render: (text, record) => (
......@@ -53,33 +55,33 @@ const ReturnPrDeliver: React.FC = () => {
),
},
{
title: '申请单摘要',
title: intl.formatMessage({ id: 'afterService.common.basicInfo.applyAbstract' }, { default: '申请单摘要' }),
dataIndex: 'applyAbstract',
align: 'center',
ellipsis: true,
},
{
title: '供应会员',
title: intl.formatMessage({ id: 'afterService.common.basicInfo.supplierName' }, { default: '供应会员' }),
dataIndex: 'supplierName',
align: 'center',
},
{
title: '退款金额',
title: intl.formatMessage({ id: 'afterService.common.return.refundAmount' }, { default: '退款金额' }),
dataIndex: 'refundAmount',
align: 'center',
},
{
title: '单据时间',
title: intl.formatMessage({ id: 'afterService.common.basicInfo.applyTime' }, { default: '单据时间' }),
dataIndex: 'applyTime',
align: 'center',
},
{
title: '退货批次',
title: intl.formatMessage({ id: 'afterService.common.return.returnBatch' }, { default: '退货批次' }),
dataIndex: 'returnBatch',
align: 'center',
},
{
title: '退货发货单号',
title: intl.formatMessage({ id: 'afterService.common.return.returnDeliveryNo' }, { default: '退货发货单号' }),
dataIndex: 'returnDeliveryNo',
align: 'center',
render: (text, record) => (
......@@ -91,7 +93,7 @@ const ReturnPrDeliver: React.FC = () => {
),
},
{
title: '外部状态',
title: intl.formatMessage({ id: 'afterService.common.basicInfo.outerStatus' }, { default: '外部状态' }),
dataIndex: 'outerStatusName',
align: 'center',
render: (text, record) => (
......@@ -99,13 +101,13 @@ const ReturnPrDeliver: React.FC = () => {
),
},
{
title: '内部状态',
title: intl.formatMessage({ id: 'afterService.common.basicInfo.innerStatus' }, { default: '内部状态' }),
dataIndex: 'innerStatusName',
align: 'center',
render: (text, record) => <Badge color={RETURN_INNER_STATUS_BADGE_MAP[record.innerStatus] || '#606266'} text={text} />,
},
{
title: '操作',
title: intl.formatMessage({ id: 'common.table.action' }),
dataIndex: 'option',
align: 'center',
render: (text, record) => (
......@@ -114,7 +116,7 @@ const ReturnPrDeliver: React.FC = () => {
type="link"
onClick={() => history.push(`/memberCenter/afterService/returnApplication/returnPrDeliver/verify?id=${record.returnId}`)}
>
退货发货
{intl.formatMessage({ id: 'returnApplication.returnPrDeliver.allRefund.deliver' }, { default: '退货发货' })}
</Button>
</>
),
......
src/pages/afterService/returnApplication/returnPrDeliver/schema/index.ts
View file @ 8aabd8a8
......@@ -6,9 +6,12 @@
* @Description:
*/
import { ISchema } from '@formily/antd';
import { getIntl } from 'umi';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { UPLOAD_TYPE } from '@/constants';
const intl = getIntl();
export const listSearchSchema: ISchema = {
type: 'object',
properties: {
......@@ -20,9 +23,9 @@ export const listSearchSchema: ISchema = {
type: 'string',
'x-component': 'Search',
'x-component-props': {
placeholder: '搜索',
placeholder: intl.formatMessage({ id: 'afterService.common.query.applyNo.placeholder' }, { default: '搜索' }),
align: 'flex-left',
tip: '输入 申请单号 进行搜索',
tip: intl.formatMessage({ id: 'afterService.common.query.applyNo.tip' }, { default: '输入 申请单号 进行搜索' }),
},
},
[FORM_FILTER_PATH]: {
......@@ -38,14 +41,14 @@ export const listSearchSchema: ISchema = {
applyAbstract: {
type: 'string',
'x-component-props': {
placeholder: '申请单摘要',
placeholder: intl.formatMessage({ id: 'afterService.common.query.applyAbstract.placeholder' }, { default: '申请单摘要' }),
allowClear: true,
},
},
supplierName: {
type: 'string',
'x-component-props': {
placeholder: '供应会员',
placeholder: intl.formatMessage({ id: 'afterService.common.query.supplierName.placeholder' }, { default: '供应会员' }),
allowClear: true,
},
},
......@@ -54,7 +57,7 @@ export const listSearchSchema: ISchema = {
default: '',
'x-component': 'dateSelect',
'x-component-props': {
placeholder: '单据时间(全部)',
placeholder: intl.formatMessage({ id: 'afterService.common.query.date.placeholder' }, { default: '单据时间(全部)' }),
allowClear: true,
},
},
......@@ -64,7 +67,7 @@ export const listSearchSchema: ISchema = {
span: 1,
},
'x-component-props': {
children: '查询',
children: intl.formatMessage({ id: 'afterService.common.query.submit' }, { default: '查询' }),
},
},
},
......
src/pages/afterService/returnApplication/returnPrDeliver/verify.tsx
View file @ 8aabd8a8
......@@ -7,7 +7,7 @@
*/
import React, { useState } from 'react';
import { Button } from 'antd';
import { history } from 'umi';
import { history, useIntl } from 'umi';
import { postAsReturnGoodsManualReturnDeliveryGoods } from '@/services/AfterServiceV2Api';
import { SettingOutlined } from '@ant-design/icons';
import moment from 'moment';
......@@ -21,6 +21,8 @@ const ReturnPrDeliverVerify: React.FC = () => {
const [visible, setVisible] = useState(false);
const [submitLoading, setSubmitLoading] = useState(false);
const intl = useIntl();
const handleSubmit = (values: ValuesType) => {
if (!id) {
return;
......@@ -72,7 +74,7 @@ const ReturnPrDeliverVerify: React.FC = () => {
icon={<SettingOutlined />}
onClick={() => handleVisibleDrawer(true)}
>
退货发货
{intl.formatMessage({ id: 'returnApplication.returnPrDeliver.allRefund.deliver' }, { default: '退货发货' })}
</Button>
)}
......
src/pages/afterService/returnApplication/returnPrSubmit/components/ReturnForm/index.tsx
View file @ 8aabd8a8
......@@ -2,7 +2,7 @@ import React, { useState, useEffect, useMemo } from 'react';
import { Button, Card, Spin, Badge, message, Upload } from 'antd';
import { ColumnType } from 'antd/lib/table/interface';
import { ArrayTable } from '@formily/antd-components';
import { history, Prompt, Link } from 'umi';
import { history, Prompt, Link, useIntl } from 'umi';
import moment from 'moment';
import { findLastIndex } from 'lodash';
import { PageHeaderWrapper } from '@ant-design/pro-layout';
......@@ -195,9 +195,11 @@ const ReturnForm: React.FC<BillsFormProps> = ({
const isMateriel = isMaterialOrder(orderTypeValue);
const intl = useIntl();
const tableColumn: ColumnType<any>[] = [
{
title: '订单号',
title: intl.formatMessage({ id: 'afterService.order.query.column.orderNo' }, { default: '订单号' }),
dataIndex: 'orderNo',
render: (text, record) => (
<a
......@@ -209,28 +211,28 @@ const ReturnForm: React.FC<BillsFormProps> = ({
),
},
{
title: '订单摘要',
title: intl.formatMessage({ id: 'afterService.order.query.column.digest' }, { default: '订单摘要' }),
dataIndex: 'digest',
ellipsis: true,
},
{
title: '供应会员',
title: intl.formatMessage({ id: 'afterService.order.query.column.vendorMemberName' }, { default: '供应会员' }),
dataIndex: 'vendorMemberName',
},
{
title: '下单时间',
title: intl.formatMessage({ id: 'afterService.order.query.column.createTime' }, { default: '下单时间' }),
dataIndex: 'createTime',
},
{
title: '订单状态',
title: intl.formatMessage({ id: 'afterService.order.query.column.outerStatusName' }, { default: '订单状态' }),
dataIndex: 'outerStatusName',
},
{
title: '订单类型',
title: intl.formatMessage({ id: 'afterService.order.query.column.orderTypeName' }, { default: '订单类型' }),
dataIndex: 'orderTypeName',
},
isMateriel ? {
title: '合同编号',
title: intl.formatMessage({ id: 'afterService.order.query.column.contractNo' }, { default: '合同编号' }),
dataIndex: 'contractNo',
render: (text, record) => (
<a
......@@ -245,53 +247,53 @@ const ReturnForm: React.FC<BillsFormProps> = ({
const childTableColumn: ColumnType<any>[] = [
!isMateriel ? {
title: '商品ID',
title: intl.formatMessage({ id: 'afterService.order.query.column.productNo' }, { default: '商品ID' }),
dataIndex: 'productNo',
} : {
title: '物料编号',
title: intl.formatMessage({ id: 'afterService.order.query.column.materialNo' }, { default: '物料编号' }),
dataIndex: 'productNo',
},
!isMateriel ? {
title: '商品名称',
title: intl.formatMessage({ id: 'afterService.order.query.column.name' }, { default: '商品名称' }),
dataIndex: 'name',
ellipsis: true,
} : {
title: '物料名称、规格',
title: `${intl.formatMessage({ id: 'afterService.order.query.column.materialName' }, { default: '物料名称' })}、${intl.formatMessage({ id: 'afterService.order.query.column.quotedSpec' }, { default: '规格' })}`,
dataIndex: 'name',
render: (text, record) => `${text}/${record.quotedSpec}`,
},
{
title: '品类',
title: intl.formatMessage({ id: 'afterService.order.query.column.category' }, { default: '品类' }),
dataIndex: 'category',
},
{
title: '品牌',
title: intl.formatMessage({ id: 'afterService.order.query.column.brand' }, { default: '品牌' }),
dataIndex: 'brand',
},
{
title: '单位',
title: intl.formatMessage({ id: 'afterService.order.query.column.unit' }, { default: '单位' }),
dataIndex: 'unit',
},
{
title: '订单数量',
title: intl.formatMessage({ id: 'afterService.order.query.column.quantity' }, { default: '订单数量' }),
dataIndex: 'quantity',
},
{
title: '单价',
title: intl.formatMessage({ id: 'afterService.order.query.column.price' }, { default: '单价' }),
dataIndex: 'price',
render: (text) => `¥ ${text}`,
render: (text) => `${intl.formatMessage({ id: 'common.money' }, { default: '¥' })} ${text}`,
},
{
title: '金额',
title: intl.formatMessage({ id: 'afterService.order.query.column.amount' }, { default: '金额' }),
dataIndex: 'amount',
render: (text) => `¥ ${text}`,
render: (text) => `${intl.formatMessage({ id: 'common.money' }, { default: '¥' })} ${text}`,
},
{
title: '已退货数量',
title: intl.formatMessage({ id: 'afterService.order.query.column.returnCount' }, { default: '已退货数量' }),
dataIndex: 'returnCount',
},
{
title: '已退款金额',
title: intl.formatMessage({ id: 'afterService.order.query.column.returnAmount' }, { default: '已退款金额' }),
dataIndex: 'returnAmount',
},
];
......@@ -490,11 +492,11 @@ const ReturnForm: React.FC<BillsFormProps> = ({
const orderTypeVal = addSchemaAction.getFieldValue('orderType');
if (!supplierMemberVal || !supplierMemberVal.length) {
message.error('请先选择供应会员');
message.error(intl.formatMessage({ id: 'afterService.apply.supplierMember.nothing' }, { default: '请先选择供应会员' }));
return;
}
if (!orderTypeVal) {
message.error('请先选择售后订单类型');
message.error(intl.formatMessage({ id: 'afterService.apply.orderType.nothing' }, { default: '请先选择售后订单类型' }));
return;
}
setVisibleGoodsDrawer(true);
......@@ -508,7 +510,7 @@ const ReturnForm: React.FC<BillsFormProps> = ({
disabled={!isEdit || !!id}
block
>
{!isMateriel ? '选择退货商品' : '选择退货物料'}
{!isMateriel ? intl.formatMessage({ id: 'afterService.apply.product.add.normal' }, { default: '选择退货商品' }) : intl.formatMessage({ id: 'afterService.apply.product.add.material' }, { default: '选择退货物料' })}
</Button>
);
......@@ -650,7 +652,7 @@ const ReturnForm: React.FC<BillsFormProps> = ({
marginRight: 20,
}}
>
编辑
{intl.formatMessage({ id: 'afterService.common.edit' }, { default: '编辑' })}
</a>
<a
onClick={() => handleRemoveItem(index)}
......@@ -658,14 +660,14 @@ const ReturnForm: React.FC<BillsFormProps> = ({
color: '#ff4d4f',
}}
>
删除
{intl.formatMessage({ id: 'afterService.common.delete' }, { default: '删除' })}
</a>
</>
);
const beforeUpload = file => {
if (file.size / 1024 / 1024 > 20) {
message.warning('图片大小超过20M');
message.warning(intl.formatMessage({ id: 'afterService.apply.upload.legal' }, { default: '图片大小超过20M' }));
return Upload.LIST_IGNORE;
}
return Promise.resolve();
......@@ -785,13 +787,13 @@ const ReturnForm: React.FC<BillsFormProps> = ({
padding: 24,
}}
onBack={() => history.goBack()}
backIcon={<ReutrnEle description="返回" />}
backIcon={<ReutrnEle description={intl.formatMessage({ id: 'afterService.apply.back' }, { default: '返回' })} />}
title={
!id ?
'新建退货申请单' :
intl.formatMessage({ id: 'returnApplication.returnPrSubmit.add' }, { default: '新建退货申请单' }) :
isEdit ?
'编辑退货申请单' :
'查看退货申请单'
intl.formatMessage({ id: 'returnApplication.returnPrSubmit.edit' }, { default: '编辑退货申请单' }) :
intl.formatMessage({ id: 'returnApplication.returnPrSubmit.check' }, { default: '查看退货申请单' })
}
extra={
(isEdit || !id)
......@@ -803,7 +805,7 @@ const ReturnForm: React.FC<BillsFormProps> = ({
loading={submitLoading}
onClick={() => addSchemaAction.submit()}
>
保存
{intl.formatMessage({ id: 'afterService.apply.save' }, { default: '保存' })}
</Button>,
]
: []
......@@ -861,7 +863,7 @@ const ReturnForm: React.FC<BillsFormProps> = ({
</Card>
<GoodsDrawer
title={!isMateriel ? '选择退货商品' : '选择退货物料'}
title={!isMateriel ? intl.formatMessage({ id: 'afterService.apply.product.add.normal' }, { default: '选择退货商品' }) : intl.formatMessage({ id: 'afterService.apply.product.add.material' }, { default: '选择退货物料' })}
afterType={3}
visible={visibleGoodsDrawer}
fetchOrderList={getOrderList}
......@@ -884,7 +886,7 @@ const ReturnForm: React.FC<BillsFormProps> = ({
isEdit={isEdit}
/>
<Prompt when={unsaved} message="您还有未保存的内容，是否确定要离开？" />
<Prompt when={unsaved} message={intl.formatMessage({ id: 'common.tip.save.confirm' }, { default: '您还有未保存的内容，是否确定要离开？' })} />
</PageHeaderWrapper>
</Spin>
);
......
src/pages/afterService/returnApplication/returnPrSubmit/index.tsx
View file @ 8aabd8a8
......@@ -15,7 +15,7 @@ import {
Space,
message,
} from 'antd';
import { history } from 'umi';
import { history, useIntl } from 'umi';
import {
ClockCircleOutlined,
PlusOutlined,
......@@ -47,9 +47,11 @@ const formActions = createFormActions();
const ReturnPrSubmit: React.FC = () => {
const ref = useRef<any>({});
const intl = useIntl();
const handleDelete = record => {
const msg = message.loading({
content: '正在删除',
content: intl.formatMessage({ id: 'afterService.common.delete.message' }, { default: '正在删除' }),
duration: 0,
});
postAsReturnGoodsDelete({
......@@ -65,7 +67,7 @@ const ReturnPrSubmit: React.FC = () => {
const handleSubmit = record => {
const msg = message.loading({
content: '正在提交',
content: intl.formatMessage({ id: 'afterService.common.commit.message' }, { default: '正在提交' }),
duration: 0,
});
postAsReturnGoodsSubmit({
......@@ -81,7 +83,7 @@ const ReturnPrSubmit: React.FC = () => {
const defaultColumns: ColumnType<any>[] = [
{
title: '申请单号',
title: intl.formatMessage({ id: 'afterService.common.basicInfo.applyNo' }, { default: '申请单号' }),
dataIndex: 'applyNo',
align: 'center',
render: (text, record) => (
......@@ -95,28 +97,28 @@ const ReturnPrSubmit: React.FC = () => {
),
},
{
title: '申请单摘要',
title: intl.formatMessage({ id: 'afterService.common.basicInfo.applyAbstract' }, { default: '申请单摘要' }),
dataIndex: 'applyAbstract',
align: 'center',
ellipsis: true,
},
{
title: '供应会员',
title: intl.formatMessage({ id: 'afterService.common.basicInfo.supplierName' }, { default: '供应会员' }),
dataIndex: 'supplierName',
align: 'center',
},
{
title: '退款金额',
title: intl.formatMessage({ id: 'afterService.common.return.refundAmount' }, { default: '退款金额' }),
dataIndex: 'refundAmount',
align: 'center',
},
{
title: '单据时间',
title: intl.formatMessage({ id: 'afterService.common.basicInfo.applyTime' }, { default: '单据时间' }),
dataIndex: 'applyTime',
align: 'center',
},
{
title: '外部状态',
title: intl.formatMessage({ id: 'afterService.common.basicInfo.outerStatus' }, { default: '外部状态' }),
dataIndex: 'outerStatusName',
align: 'center',
render: (text, record) => (
......@@ -124,13 +126,13 @@ const ReturnPrSubmit: React.FC = () => {
),
},
{
title: '内部状态',
title: intl.formatMessage({ id: 'afterService.common.basicInfo.innerStatus' }, { default: '内部状态' }),
dataIndex: 'innerStatusName',
align: 'center',
render: (text, record) => <Badge color={RETURN_INNER_STATUS_BADGE_MAP[record.innerStatus] || '#606266'} text={text} />,
},
{
title: '操作',
title: intl.formatMessage({ id: 'common.table.action' }),
dataIndex: 'option',
align: 'center',
render: (text, record) => (
......@@ -140,7 +142,7 @@ const ReturnPrSubmit: React.FC = () => {
type="link"
onClick={() => handleSubmit(record)}
>
提交
{intl.formatMessage({ id: 'afterService.common.commit' }, { default: '提交' })}
</Button>
)}
{(
......@@ -151,21 +153,21 @@ const ReturnPrSubmit: React.FC = () => {
type="link"
onClick={() => history.push(`/memberCenter/afterService/returnApplication/returnPrSubmit/edit?id=${record.returnId}`)}
>
编辑
{intl.formatMessage({ id: 'afterService.common.edit' }, { default: '编辑' })}
</Button>
)}
{record.innerStatus === RETURN_INNER_STATUS_UNCOMMITTED && (
<Popconfirm
title="确定要删除吗？"
okText="是"
cancelText="否"
title={intl.formatMessage({ id: 'afterService.common.delete.tip' }, { default: '确定要删除吗？' })}
okText={intl.formatMessage({ id: 'afterService.common.delete.okText' }, { default: '是' })}
cancelText={intl.formatMessage({ id: 'afterService.common.delete.cancelText' }, { default: '否' })}
onConfirm={() => handleDelete(record)}
>
<Button
type="link"
danger
>
删除
{intl.formatMessage({ id: 'afterService.common.delete' }, { default: '删除' })}
</Button>
</Popconfirm>
)}
......@@ -206,7 +208,7 @@ const ReturnPrSubmit: React.FC = () => {
}
>
<PlusOutlined />
新建
{intl.formatMessage({ id: 'afterService.common.add' }, { default: '新建' })}
</Button>
</Space>
</>
......
src/pages/afterService/returnApplication/returnPrSubmit/schema/index.ts
View file @ 8aabd8a8
......@@ -6,9 +6,12 @@
* @Description:
*/
import { ISchema } from '@formily/antd';
import { getIntl } from 'umi';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { UPLOAD_TYPE } from '@/constants';
const intl = getIntl();
export const listSearchSchema: ISchema = {
type: 'object',
properties: {
......@@ -34,8 +37,8 @@ export const listSearchSchema: ISchema = {
type: 'string',
'x-component': 'Search',
'x-component-props': {
placeholder: '搜索',
tip: '输入 申请单号 进行搜索',
placeholder: intl.formatMessage({ id: 'afterService.common.query.applyNo.placeholder' }, { default: '搜索' }),
tip: intl.formatMessage({ id: 'afterService.common.query.applyNo.tip' }, { default: '输入 申请单号 进行搜索' }),
},
},
},
......@@ -52,7 +55,7 @@ export const listSearchSchema: ISchema = {
applyAbstract: {
type: 'string',
'x-component-props': {
placeholder: '申请单摘要',
placeholder: intl.formatMessage({ id: 'afterService.common.query.applyAbstract.placeholder' }, { default: '申请单摘要' }),
allowClear: true,
style: {
width: 160,
......@@ -62,7 +65,7 @@ export const listSearchSchema: ISchema = {
supplierName: {
type: 'string',
'x-component-props': {
placeholder: '供应会员',
placeholder: intl.formatMessage({ id: 'afterService.common.query.supplierName.placeholder' }, { default: '供应会员' }),
allowClear: true,
style: {
width: 160,
......@@ -73,7 +76,7 @@ export const listSearchSchema: ISchema = {
type: 'string',
'x-component': 'dateSelect',
'x-component-props': {
placeholder: '单据时间(全部)',
placeholder: intl.formatMessage({ id: 'afterService.common.query.date.placeholder' }, { default: '单据时间(全部)' }),
allowClear: true,
style: {
width: 160,
......@@ -86,7 +89,7 @@ export const listSearchSchema: ISchema = {
span: 1,
},
'x-component-props': {
children: '查询',
children: intl.formatMessage({ id: 'afterService.common.query.submit' }, { default: '查询' }),
},
},
},
......
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