Commit 80a1af2e authored by 前端-黄佳鑫's avatar 前端-黄佳鑫

fix: 修改物料牌号字段名

parent d08e2311
......@@ -168,7 +168,7 @@ export default {
'afterService.apply.product.repair.normal':'Please select a repair product',
'afterService.apply.product.repair.material':'Please select repair material',
'afterService.apply.orderNo':'Order number',
'afterService.apply.materialsTrademark': 'Material grade',
'afterService.apply.productBrandNo': 'Material grade',
'afterService.apply.productId':'Product ID',
'afterService.apply.productName':'Product name',
'afterService.apply.category':'Category',
......
......@@ -168,7 +168,7 @@ export default {
'afterService.apply.product.repair.normal': '수리 상품 선택',
'afterService.apply.product.repair.material': '수리 재료를 선택하세요',
'afterService.apply.orderNo': '주문 번호',
'afterService.apply.materialsTrademark': '재료 등급',
'afterService.apply.productBrandNo': '재료 등급',
'afterService.apply.productId': '상품 ID',
'afterService.apply.productName': '상품명',
'afterService.apply.category': '종류',
......
......@@ -168,7 +168,7 @@ export default {
'afterService.apply.product.repair.normal': '请选择维修商品',
'afterService.apply.product.repair.material': '请选择维修物料',
'afterService.apply.orderNo': '订单号',
'afterService.apply.materialsTrademark': '物料牌号',
'afterService.apply.productBrandNo': '物料牌号',
'afterService.apply.productId': '商品ID',
'afterService.apply.productName': '商品名称',
'afterService.apply.category': '品类',
......
......@@ -276,8 +276,8 @@ const AsRefundProductList: React.FC<AsRefundProductListProps> = (props: AsRefund
]
: [
{
title: intl.formatMessage({ id: 'afterService.apply.materialsTrademark' }, { default: '物料牌号' }),
dataIndex: 'materialsTrademark',
title: intl.formatMessage({ id: 'afterService.apply.productBrandNo' }, { default: '物料牌号' }),
dataIndex: 'productBrandNo',
},
{
title: intl.formatMessage({ id: 'afterService.common.productColumns.materialNo' }, { default: '物料编号' }),
......
......@@ -43,9 +43,9 @@ export const createSchema = (type: 2 | 3, flowType: 'returnDeliver' | 'exchangeD
title: intl.formatMessage({ id: 'afterService.components.DeliverDrawer.orderNo' }, { default: '订单号' }),
editable: false,
},
materialsTrademark: {
productBrandNo: {
type: 'string',
title: intl.formatMessage({ id: 'afterService.apply.materialsTrademark' }, { default: '物料牌号' }),
title: intl.formatMessage({ id: 'afterService.apply.productBrandNo' }, { default: '物料牌号' }),
editable: false,
visible: isMateriel
},
......
......@@ -152,8 +152,8 @@ const ReturnInfo: React.FC<ReturnInfoProps> = ({
]
: [
{
title: intl.formatMessage({ id: 'afterService.apply.materialsTrademark' }, { default: '物料牌号' }),
dataIndex: 'materialsTrademark',
title: intl.formatMessage({ id: 'afterService.apply.productBrandNo' }, { default: '物料牌号' }),
dataIndex: 'productBrandNo',
},
{
title: intl.formatMessage({ id: 'afterService.common.productColumns.materialNo' }, { default: '物料编号' }),
......
......@@ -97,7 +97,7 @@ export interface ReturnApplyInfo {
/**
* 物料牌号
*/
materialsTrademark?: string
productBrandNo?: string
/**
* 商品名称
*/
......@@ -195,7 +195,7 @@ const ReturnInfoDrawer: React.FC<ReturnInfoDrawerProps> = ({
schemaAction.setFieldState('productName', state => {
state.title = intl.formatMessage({ id: 'afterService.components.ReturnInfoDrawer.materialName' }, { default: '物料名称' });
});
schemaAction.setFieldState('materialsTrademark', state => {
schemaAction.setFieldState('productBrandNo', state => {
state.visible = true;
});
}
......
......@@ -42,9 +42,9 @@ const schema: ISchema = {
title: intl.formatMessage({ id: 'afterService.components.ReturnInfoDrawer.orderNo' }, { default: '订单号' }),
'x-component': 'Text',
},
materialsTrademark: {
productBrandNo: {
type: 'string',
title: intl.formatMessage({ id: 'afterService.apply.materialsTrademark' }, { default: '物料牌号' }),
title: intl.formatMessage({ id: 'afterService.apply.productBrandNo' }, { default: '物料牌号' }),
visible: false,
'x-component': 'Text',
},
......
......@@ -111,7 +111,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
setApplyInfo({
orderId: record.orderId,
orderNo: record.orderNo,
materialsTrademark: record.materialsTrademark,
productBrandNo: record.productBrandNo,
productName: record.productName,
category: record.category,
brand: record.brand,
......@@ -174,8 +174,8 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
]
: [
{
title: intl.formatMessage({ id: 'afterService.apply.materialsTrademark' }, { default: '物料牌号' }),
dataIndex: 'materialsTrademark',
title: intl.formatMessage({ id: 'afterService.apply.productBrandNo' }, { default: '物料牌号' }),
dataIndex: 'productBrandNo',
},
{
title: intl.formatMessage({ id: 'afterService.common.productColumns.materialNo' }, { default: '物料编号' }),
......
......@@ -95,7 +95,7 @@ const ReturnPrDeliverVerify: React.FC = () => {
.map((item) => ({
orderNo: item.orderNo,
productId: item.productId,
materialsTrademark: item.materialsTrademark,
productBrandNo: item.productBrandNo,
productName: item.productName,
category: item.category,
brand: item.brand,
......
......@@ -254,7 +254,7 @@ const ReturnForm: React.FC<BillsFormProps> = ({
dataIndex: 'productNo',
},
isMateriel && {
title: intl.formatMessage({ id: 'afterService.apply.materialsTrademark' }, { default: '物料牌号' }),
title: intl.formatMessage({ id: 'afterService.apply.productBrandNo' }, { default: '物料牌号' }),
dataIndex: 'name',
ellipsis: true,
},
......
......@@ -292,9 +292,9 @@ export const addSchema = (orderType: number): ISchema => {
title: intl.formatMessage({ id: 'afterService.apply.orderNo' }, { default: '订单号' }),
'x-component': 'OrderNo',
},
materialsTrademark: {
productBrandNo: {
type: 'string',
title: intl.formatMessage({ id: 'afterService.apply.materialsTrademark' }, { default: '物料牌号' }),
title: intl.formatMessage({ id: 'afterService.apply.productBrandNo' }, { default: '物料牌号' }),
'x-component': 'Text',
},
productId: {
......
......@@ -116,7 +116,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
setApplyInfo({
orderId: record.orderId,
orderNo: record.orderNo,
materialsTrademark: record.materialsTrademark,
productBrandNo: record.productBrandNo,
productName: record.productName,
category: record.category,
brand: record.brand,
......@@ -200,8 +200,8 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
]
: [
{
title: intl.formatMessage({ id: 'afterService.apply.materialsTrademark' }, { default: '物料牌号' }),
dataIndex: 'materialsTrademark',
title: intl.formatMessage({ id: 'afterService.apply.productBrandNo' }, { default: '物料牌号' }),
dataIndex: 'productBrandNo',
},
{
title: intl.formatMessage({ id: 'afterService.common.productColumns.materialNo' }, { 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