Skip to content

J
jinfa-platform
Commit bd6c9875 authored by Bill's avatar Bill
Browse files
Options

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

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