Commit bd6c9875 authored by Bill's avatar Bill

Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-paltform into dev

parents 156ff3ea be8041d3
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-12-22 17:57:26
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-12-22 17:57:26
* @LastEditTime: 2020-12-22 18:53:56
* @Description: 获取 单据列表 弹窗数据接口相关
*/
import { PublicApi } from '@/services/api';
......@@ -107,13 +107,15 @@ export const getRefundDeliveryList = async (params: any) => {
...item,
id: item.returnId,
memberName: item.supplierName,
membersId: item.parentMemberId,
membersRoleId: item.parentMemberRoleId,
supplyMembersName: item.supplierName,
supplyMembersId: item.parentMemberId,
supplyMembersRoleId: item.parentMemberRoleId,
deliveryAddresId: item.returnGoodsAddress.receiveId,
fullAddress: item.returnGoodsAddress.receiveAddress || '',
receiverName: item.returnGoodsAddress.receiveUserName || '',
phone: item.returnGoodsAddress.receiveUserTel || '',
deliveryType: item.returnGoodsAddress.deliveryType || '',
orderNo: item.applyNo,
})),
total: res.data.totalCount,
};
......@@ -136,13 +138,15 @@ export const getRefundWarehousingList = async (params: any) => {
...item,
id: item.returnId,
memberName: item.consumerName,
membersId: item.parentMemberId,
membersRoleId: item.parentMemberRoleId,
supplyMembersName: item.supplierName,
supplyMembersId: item.parentMemberId,
supplyMembersRoleId: item.parentMemberRoleId,
deliveryAddresId: item.returnGoodsAddress.sendId,
fullAddress: item.returnGoodsAddress.sendAddress || '',
receiverName: item.returnGoodsAddress.sendUserName || '',
phone: item.returnGoodsAddress.sendUserTel || '',
deliveryType: item.returnGoodsAddress.deliveryType || '',
orderNo: item.applyNo,
})),
total: res.data.totalCount,
};
......@@ -165,13 +169,15 @@ export const getExchangeReturnDeliveryList = async (params: any) => {
...item,
id: item.replaceId,
memberName: item.supplierName,
membersId: item.parentMemberId,
membersRoleId: item.parentMemberRoleId,
supplyMembersName: item.supplierName,
supplyMembersId: item.parentMemberId,
supplyMembersRoleId: item.parentMemberRoleId,
deliveryAddresId: item.returnGoodsAddress.receiveId,
fullAddress: item.returnGoodsAddress.receiveAddress || '',
receiverName: item.returnGoodsAddress.receiveUserName || '',
phone: item.returnGoodsAddress.receiveUserTel || '',
deliveryType: item.returnGoodsAddress.deliveryType || '',
orderNo: item.applyNo,
})),
total: res.data.totalCount,
};
......@@ -194,13 +200,15 @@ export const getExchangeReturnWarehousingList = async (params: any) => {
...item,
id: item.replaceId,
memberName: item.consumerName,
membersId: item.parentMemberId,
membersRoleId: item.parentMemberRoleId,
supplyMembersName: item.supplierName,
supplyMembersId: item.parentMemberId,
supplyMembersRoleId: item.parentMemberRoleId,
deliveryAddresId: item.returnGoodsAddress.receiveId,
fullAddress: item.returnGoodsAddress.receiveAddress || '',
receiverName: item.returnGoodsAddress.receiveUserName || '',
phone: item.returnGoodsAddress.receiveUserTel || '',
deliveryType: item.returnGoodsAddress.deliveryType || '',
orderNo: item.applyNo,
})),
total: res.data.totalCount,
};
......@@ -223,13 +231,15 @@ export const getExchangeDeliveryList = async (params: any) => {
...item,
id: item.replaceId,
memberName: item.supplierName,
membersId: item.parentMemberId,
membersRoleId: item.parentMemberRoleId,
supplyMembersName: item.supplierName,
supplyMembersId: item.parentMemberId,
supplyMembersRoleId: item.parentMemberRoleId,
deliveryAddresId: item.replaceGoodsAddress.receiveId,
fullAddress: item.replaceGoodsAddress.receiveAddress || '',
receiverName: item.replaceGoodsAddress.receiveUserName || '',
phone: item.replaceGoodsAddress.receiveUserTel || '',
deliveryType: item.replaceGoodsAddress.deliveryType || '',
orderNo: item.applyNo,
})),
total: res.data.totalCount,
};
......@@ -252,13 +262,15 @@ export const getExchangeWarehousingList = async (params: any) => {
...item,
id: item.replaceId,
memberName: item.consumerName,
membersId: item.parentMemberId,
membersRoleId: item.parentMemberRoleId,
supplyMembersName: item.supplierName,
supplyMembersId: item.parentMemberId,
supplyMembersRoleId: item.parentMemberRoleId,
deliveryAddresId: item.replaceGoodsAddress.receiveId,
fullAddress: item.replaceGoodsAddress.receiveAddress || '',
receiverName: item.replaceGoodsAddress.receiveUserName || '',
phone: item.replaceGoodsAddress.receiveUserTel || '',
deliveryType: item.replaceGoodsAddress.deliveryType || '',
orderNo: item.applyNo,
})),
total: res.data.totalCount,
};
......
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