Commit abb04fdb authored by XieZhiXiong's avatar XieZhiXiong

feat: 对接 scm订单售后退货相关

parent b33cd4c9
...@@ -243,7 +243,6 @@ const ReturnForm: React.FC<BillsFormProps> = ({ ...@@ -243,7 +243,6 @@ const ReturnForm: React.FC<BillsFormProps> = ({
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
PublicApi.getOrderCommonAfterSalePage({ PublicApi.getOrderCommonAfterSalePage({
...payload, ...payload,
orderNo: detailInfo.orderNo,
vendorMemberId: supplierMemberValue[0].memberId, vendorMemberId: supplierMemberValue[0].memberId,
vendorRoleId: supplierMemberValue[0].roleId, vendorRoleId: supplierMemberValue[0].roleId,
orderType: orderTypeValue, orderType: orderTypeValue,
...@@ -625,14 +624,12 @@ const ReturnForm: React.FC<BillsFormProps> = ({ ...@@ -625,14 +624,12 @@ const ReturnForm: React.FC<BillsFormProps> = ({
taxRate: item.taxRate, taxRate: item.taxRate,
contractId: item.contractId, contractId: item.contractId,
contractNo: item.contractNo, contractNo: item.contractNo,
associated: !isMateriel ? '' : `${item.productNo}/${item.name}/${item.category}/${item.brand}`, associated: !isMateriel ? '' : `${item.associatedProductId}/${item.quotedName}/${item.category}/${item.brand}`,
associatedProductId: item.materialId || '', associatedProductId: item.quotedProductNo || '',
associatedProductName: `${item.materialName || ''}${item.materialType ? '/' + item.materialType : ''}`, associatedProductName: `${item.quotedName || ''}`,
materielName: item.materialName || '', associatedCategory: item.quotedCategory || '',
associatedType: item.materialType || '', associatedBrand: item.quotedBrand || '',
associatedCategory: item.materialCategory || '', associatedUnit: item.unit || '',
associatedBrand: item.materialBrand || '',
associatedUnit: item.materialUnit || '',
}; };
value.push(atom); value.push(atom);
}); });
......
...@@ -306,27 +306,27 @@ export const addSchema = (orderType: number): ISchema => { ...@@ -306,27 +306,27 @@ export const addSchema = (orderType: number): ISchema => {
title: '订单号', title: '订单号',
'x-component': 'OrderNo', 'x-component': 'OrderNo',
}, },
materielNo: { associatedProductId: {
type: 'string', type: 'string',
title: '物料编号', title: '物料编号',
'x-component': 'Text', 'x-component': 'Text',
}, },
materielNameAndType: { associatedProductName: {
type: 'string', type: 'string',
title: '物料名称、规格', title: '物料名称、规格',
'x-component': 'Text', 'x-component': 'Text',
}, },
materielCategory: { associatedCategory: {
type: 'string', type: 'string',
title: '品类', title: '品类',
'x-component': 'Text', 'x-component': 'Text',
}, },
materielBrand: { associatedBrand: {
type: 'string', type: 'string',
title: '品牌', title: '品牌',
'x-component': 'Text', 'x-component': 'Text',
}, },
materielUnit: { associatedUnit: {
type: 'string', type: 'string',
title: '单位', title: '单位',
'x-component': 'Text', 'x-component': 'Text',
......
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