Commit abb04fdb authored by XieZhiXiong's avatar XieZhiXiong

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

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