diff --git a/proxy.conf.js b/proxy.conf.js
index 89d93e1f..1f212dc6 100644
--- a/proxy.conf.js
+++ b/proxy.conf.js
@@ -20,7 +20,7 @@ module.exports = {
// }
'//api': {
target: {
- host: 'tms-api-dev.eascs.com',
+ host: 'tms-api-test.eascs.com',
protocol: 'https:',
port: 443
},
diff --git a/src/app/routes/financial-management/components/advance-collection/advance-collection-detail/advance-collection-detail.component.html b/src/app/routes/financial-management/components/advance-collection/advance-collection-detail/advance-collection-detail.component.html
index c3f47905..9c6992fe 100644
--- a/src/app/routes/financial-management/components/advance-collection/advance-collection-detail/advance-collection-detail.component.html
+++ b/src/app/routes/financial-management/components/advance-collection/advance-collection-detail/advance-collection-detail.component.html
@@ -12,25 +12,25 @@
基本信息
- {{ costInfo?.ltdId }}
+ {{ costInfo?.ltdName }}
- {{ costInfo?.brmdate }}
-
-
- {{ costInfo?.brmModeLabel }}
-
-
{{ costInfo?.banktypeLabel }}
-
+
{{ costInfo?.artoname }}
+
+ {{ costInfo?.shipperId }}
+
+
+ {{ costInfo?.ltdaccountId }}
+
- {{ costInfo?.recnopay |currency }}
+ {{ costInfo?.premoney |currency }}
- {{ costInfo?.ltdaccountId }}
+ {{ costInfo?.brmtypeLabel }}
@@ -52,7 +52,8 @@
-
{{index+1}}
diff --git a/src/app/routes/financial-management/components/advance-collection/advance-collection-detail/advance-collection-detail.component.ts b/src/app/routes/financial-management/components/advance-collection/advance-collection-detail/advance-collection-detail.component.ts
index 3d627fe1..5e07c69b 100644
--- a/src/app/routes/financial-management/components/advance-collection/advance-collection-detail/advance-collection-detail.component.ts
+++ b/src/app/routes/financial-management/components/advance-collection/advance-collection-detail/advance-collection-detail.component.ts
@@ -39,7 +39,7 @@ export class AdvanceCollectionDetailComponent implements OnInit {
};
loadDetail(id: any) {
- this.service.request(this.service.$api_get_receipt_header, { id }).subscribe(res => {
+ this.service.request(this.service.$api_get_advance_collection_header, { id }).subscribe(res => {
if (res) {
this.costInfo = res;
}
@@ -111,11 +111,11 @@ export class AdvanceCollectionDetailComponent implements OnInit {
return {
input: [
{ title: '序号', render: 'no', width: 70, className: 'text-left' },
- { title: '收款单号', index: 'feeHId', className: 'text-left', width: 200 },
+ { title: '收款单号', index: 'brmHCode', className: 'text-left', width: 200 },
{ title: '到账日期', index: 'billHId', className: 'text-center', width: 150 },
{
title: '到账金额',
- index: 'hrvatrate',
+ index: 'yskmoney',
type: 'widget',
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yskmoney }) },
@@ -123,7 +123,7 @@ export class AdvanceCollectionDetailComponent implements OnInit {
},
{
title: '转预收金额',
- index: 'hrvatrate',
+ index: 'yskmoney',
type: 'widget',
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yskmoney }) },
diff --git a/src/app/routes/financial-management/components/advance-collection/advance-collection.component.ts b/src/app/routes/financial-management/components/advance-collection/advance-collection.component.ts
index cb7e3c37..b946c075 100644
--- a/src/app/routes/financial-management/components/advance-collection/advance-collection.component.ts
+++ b/src/app/routes/financial-management/components/advance-collection/advance-collection.component.ts
@@ -74,12 +74,22 @@ export class AdvanceCollectionComponent implements OnInit {
cno: {
type: 'string',
title: '结算客户',
- ui: { placeholder: '请输入' }
+ ui: {
+ widget: 'select',
+ placeholder: '请选择',
+ allowClear: true,
+ asyncData: () => this.service.getCloseAccount()
+ }
},
arto: {
type: 'string',
title: '付款人',
- ui: { placeholder: '请输入' }
+ ui: {
+ widget: 'select',
+ placeholder: '请选择',
+ allowClear: true,
+ asyncData: () => this.service.getCRM()
+ }
},
brmtype: {
type: 'string',
@@ -118,9 +128,9 @@ export class AdvanceCollectionComponent implements OnInit {
private initST(): STColumn[] {
return [
{ title: '网络货运人', width: 160, index: 'ltdName' },
- { title: '银行类型', width: 120, index: 'bankTypeLabel' },
- { title: '收款账户', width: 120, index: 'ltdaccountId' },
- { title: '收款类型', width: 120, index: 'brmtype' },
+ { title: '银行类型', width: 120, index: 'banktypeLabel' },
+ { title: '收款账户', width: 150, index: 'ltdaccountId' },
+ { title: '收款类型', width: 120, index: 'brmtypeLabel' },
{
title: '预收余额',
index: 'yskmoney',
@@ -129,8 +139,8 @@ export class AdvanceCollectionComponent implements OnInit {
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yskmoney }) }
},
- { title: '付款人', index: 'arto', width: 180 },
- { title: '结算客户', index: 'cno', width: 150 },
+ { title: '付款人', index: 'artoName', width: 180 },
+ { title: '结算客户', index: 'cnoName', width: 150 },
{
title: '操作',
width: 120,
@@ -142,10 +152,10 @@ export class AdvanceCollectionComponent implements OnInit {
click: item => this.router.navigate(['/financial-management/advance-collection/detail/' + item.id])
},
{
- text: '核销',
+ text: '核销'
},
{
- text: '退款',
+ text: '退款'
}
]
}
diff --git a/src/app/routes/financial-management/components/cost-management/cost-management.component.ts b/src/app/routes/financial-management/components/cost-management/cost-management.component.ts
index 5eecf4e9..782f926a 100644
--- a/src/app/routes/financial-management/components/cost-management/cost-management.component.ts
+++ b/src/app/routes/financial-management/components/cost-management/cost-management.component.ts
@@ -93,7 +93,7 @@ export class CostManagementComponent implements OnInit {
this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageIndex: this.st.pi, pageSize: this.st.ps });
}
- routeTo(url: string, params?: any,status?: any) {
+ routeTo(url: string, params?: any, status?: any) {
this.router.navigate([url], { queryParams: params });
}
@@ -259,10 +259,11 @@ export class CostManagementComponent implements OnInit {
cno: {
type: 'string',
title: '结算客户',
- enum: [{ label: '全部', value: '全部' }],
ui: {
widget: 'select',
placeholder: '请选择',
+ allowClear: true,
+ asyncData: () => this.service.getCloseAccount(),
visibleIf: {
expand: (value: boolean) => value
}
@@ -274,22 +275,22 @@ export class CostManagementComponent implements OnInit {
private initST(): STColumn[] {
return [
- { title: '费用单号', fixed: 'left', index: 'feecode', width: 200 ,className: 'text-left',},
- { title: '网络货运人', index: 'ltdName', width: 220 ,className: 'text-left',},
- { title: '订单号', index: 'billHCode', width: 200,className: 'text-left', },
- { title: '运单号', index: 'waybillHCode', width: 200 ,className: 'text-left',},
- { title: '费用日期', index: 'feedate', width: 200 ,className: 'text-left',},
- { title: '费用类型', index: 'feetypeLabel', width: 150,className: 'text-center', },
- { title: '应付核销', index: 'ishrhx', width: 200, type: 'enum', enum: { 0: '否', 1: '是' } ,className: 'text-left',},
- { title: '结算客户', render: 'artocode', width: 200 ,className: 'text-left',},
- { title: '应收对象', index: 'artoname', width: 200 ,className: 'text-left',},
- { title: '应付对象', index: 'hrtoname', width: 200 ,className: 'text-left',},
- { title: '应收金额', render: 'armoeny', width: 100 ,className: 'text-right',},
- { title: '应付金额', render: 'hrmoney', width: 100 ,className: 'text-right',},
- { title: '收/付款金额', render: 'hrpaymoney', width: 120 ,className: 'text-right',},
- { title: '开/收票金额', render: 'hrvatmoney', width: 120 ,className: 'text-right',},
- { title: '创建时间', index: 'createTime', type: 'date', width: 200 ,className: 'text-center',},
- { title: '状态', index: 'stsLabel', width: 90 ,className: 'text-center',},
+ { title: '费用单号', fixed: 'left', index: 'feecode', width: 200, className: 'text-left' },
+ { title: '网络货运人', index: 'ltdName', width: 220, className: 'text-left' },
+ { title: '订单号', index: 'billHCode', width: 200, className: 'text-left' },
+ { title: '运单号', index: 'waybillHCode', width: 200, className: 'text-left' },
+ { title: '费用日期', index: 'feedate', width: 200, className: 'text-left' },
+ { title: '费用类型', index: 'feetypeLabel', width: 150, className: 'text-center' },
+ { title: '应付核销', index: 'ishrhx', width: 200, type: 'enum', enum: { 0: '否', 1: '是' }, className: 'text-left' },
+ { title: '结算客户', render: 'artocode', width: 200, className: 'text-left' },
+ { title: '应收对象', index: 'artoname', width: 200, className: 'text-left' },
+ { title: '应付对象', index: 'hrtoname', width: 200, className: 'text-left' },
+ { title: '应收金额', render: 'armoeny', width: 100, className: 'text-right' },
+ { title: '应付金额', render: 'hrmoney', width: 100, className: 'text-right' },
+ { title: '收/付款金额', render: 'hrpaymoney', width: 120, className: 'text-right' },
+ { title: '开/收票金额', render: 'hrvatmoney', width: 120, className: 'text-right' },
+ { title: '创建时间', index: 'createTime', type: 'date', width: 200, className: 'text-center' },
+ { title: '状态', index: 'stsLabel', width: 90, className: 'text-center' },
{
title: '操作',
fixed: 'right',
@@ -298,13 +299,13 @@ export class CostManagementComponent implements OnInit {
buttons: [
{
text: '浏览',
- click: item => this.routeTo('/financial-management/cost-management/detail/' + item.id , {status : item?.feetypeLabel})
+ click: item => this.routeTo('/financial-management/cost-management/detail/' + item.id, { status: item?.feetypeLabel })
},
{
text: '审核',
click: item => this.auditAction(item),
iif: item => item.sts === 2
- },
+ }
// {
// text: '修改',
// click: item => this.router.navigate(['/financial-management/cost-management/expenses-receivable/1'], { queryParams: { id: 1 } })
diff --git a/src/app/routes/financial-management/components/payable-order/payable-order-detail/payable-order-detail.component.ts b/src/app/routes/financial-management/components/payable-order/payable-order-detail/payable-order-detail.component.ts
index 2692a965..25e72be4 100644
--- a/src/app/routes/financial-management/components/payable-order/payable-order-detail/payable-order-detail.component.ts
+++ b/src/app/routes/financial-management/components/payable-order/payable-order-detail/payable-order-detail.component.ts
@@ -119,10 +119,14 @@ export class PayableOrderDetailComponent implements OnInit {
cno: {
type: 'string',
title: '结算客户',
- enum: [{ label: '全部', value: '' }],
ui: {
widget: 'select',
- placeholder: '请选择'
+ placeholder: '请选择',
+ allowClear: true,
+ asyncData: () => this.service.getCloseAccount(),
+ visibleIf: {
+ expand: (value: boolean) => value
+ }
},
default: ''
},
diff --git a/src/app/routes/financial-management/components/payable-order/payable-order.component.ts b/src/app/routes/financial-management/components/payable-order/payable-order.component.ts
index 876e9f48..acf9bad9 100644
--- a/src/app/routes/financial-management/components/payable-order/payable-order.component.ts
+++ b/src/app/routes/financial-management/components/payable-order/payable-order.component.ts
@@ -135,6 +135,8 @@ export class PayableOrderComponent implements OnInit {
ui: {
widget: 'select',
placeholder: '请选择',
+ allowClear: true,
+ asyncData: () => this.service.getCloseAccount(),
visibleIf: {
expand: (value: boolean) => value
}
diff --git a/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.ts b/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.ts
index c664c849..c78211b7 100644
--- a/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.ts
+++ b/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.ts
@@ -129,10 +129,11 @@ export class PaymentOrderDetailComponent implements OnInit {
cno: {
type: 'string',
title: '结算客户',
- enum: [{ label: '全部', value: '' }],
ui: {
widget: 'select',
placeholder: '请选择',
+ allowClear: true,
+ asyncData: () => this.service.getCloseAccount(),
visibleIf: {
expand: (value: boolean) => value
}
diff --git a/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts b/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts
index 73bf21a2..79ad4c5d 100644
--- a/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts
+++ b/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts
@@ -150,7 +150,10 @@ export class ReceiptOrderComponent implements OnInit {
type: 'string',
title: '付款人',
ui: {
- placeholder: '请输入',
+ widget: 'select',
+ placeholder: '请选择',
+ allowClear: true,
+ asyncData: () => this.service.getCRM(),
visibleIf: {
expand: (value: boolean) => value
}
@@ -273,7 +276,7 @@ export class ReceiptOrderComponent implements OnInit {
{
text: '浏览',
click: item => this.router.navigate(['/financial-management/receipt-order/detail/' + item.id])
- },
+ }
// {
// text: '核销'
// }
diff --git a/src/app/routes/financial-management/components/receivable-order/receivable-order-detail/receivable-order-detail.component.ts b/src/app/routes/financial-management/components/receivable-order/receivable-order-detail/receivable-order-detail.component.ts
index 3f3a30bf..d33f8709 100644
--- a/src/app/routes/financial-management/components/receivable-order/receivable-order-detail/receivable-order-detail.component.ts
+++ b/src/app/routes/financial-management/components/receivable-order/receivable-order-detail/receivable-order-detail.component.ts
@@ -104,10 +104,11 @@ export class ReceivableOrderDetailComponent implements OnInit {
cno: {
type: 'string',
title: '结算客户',
- enum: [{ label: '全部', value: '' }],
ui: {
widget: 'select',
- placeholder: '请选择'
+ placeholder: '请选择',
+ allowClear: true,
+ asyncData: () => this.service.getCloseAccount(),
},
default: ''
},
diff --git a/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts b/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts
index e40c4d06..1d8fee7d 100644
--- a/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts
+++ b/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts
@@ -146,6 +146,8 @@ export class ReceivableOrderComponent implements OnInit {
ui: {
widget: 'select',
placeholder: '请选择',
+ allowClear: true,
+ asyncData: () => this.service.getCloseAccount(),
visibleIf: {
expand: (value: boolean) => value
}
@@ -157,6 +159,8 @@ export class ReceivableOrderComponent implements OnInit {
ui: {
widget: 'select',
placeholder: '请选择',
+ allowClear: true,
+ asyncData: () => this.service.getCRM(),
visibleIf: {
expand: (value: boolean) => value
}
@@ -276,7 +280,7 @@ export class ReceivableOrderComponent implements OnInit {
text: '浏览',
click: item =>
this.router.navigate(['/financial-management/receivable-order/detail/' + item.id], { queryParams: { billHId: item.billHId } })
- },
+ }
// {
// text: '核销'
// }
diff --git a/src/app/routes/financial-management/services/freight-account.service.ts b/src/app/routes/financial-management/services/freight-account.service.ts
index 7dbddb78..e55aa067 100644
--- a/src/app/routes/financial-management/services/freight-account.service.ts
+++ b/src/app/routes/financial-management/services/freight-account.service.ts
@@ -101,8 +101,12 @@ export class FreightAccountService extends ShipperBaseService {
// 下载银行回单请求
$api_download_receipt_apply = '/api/fcc/spd/callback/receiptApply';
- // 查询预收款余额
- $api_get_advance_collection_page = '/api/fcc/ficoYskBla/list/page';
+ // 查询预收款余额
+ $api_get_advance_collection_page = '/api/fcc/ficoYskBla/list/page';
+ // 根据预收款ID获取收款单抬头
+ $api_get_advance_collection_header = '/api/fcc/ficoBrmH/getByYskblaId';
+ // 根据预收款ID获取收款单明细
+ $api_get_advance_collection_detail = '/api/fcc/ficoBrmYsk/getBrmYskByYskblaId';
constructor(public injector: Injector, public eaCacheSrv: EACacheService) {
super(injector, eaCacheSrv);
@@ -121,8 +125,8 @@ export class FreightAccountService extends ShipperBaseService {
});
}
}
- // 获取货主企业列表
- public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList';
+ // 获取货主企业列表
+ public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList';
reviewPDF(url: string) {
if (!url) {
return;
diff --git a/src/app/routes/ticket-management/components/input-invoice/add-cost-detail/add-cost-detail.component.ts b/src/app/routes/ticket-management/components/input-invoice/add-cost-detail/add-cost-detail.component.ts
index 3349f133..3ca21dbf 100644
--- a/src/app/routes/ticket-management/components/input-invoice/add-cost-detail/add-cost-detail.component.ts
+++ b/src/app/routes/ticket-management/components/input-invoice/add-cost-detail/add-cost-detail.component.ts
@@ -82,9 +82,10 @@ export class AddCostDetailComponent implements OnInit {
type: 'string',
title: '结算客户',
ui: {
- widget: 'dict-select',
- params: { dictKey: 'refund:apply:status' },
- placeholder: '请选择'
+ widget: 'select',
+ placeholder: '请选择',
+ allowClear: true,
+ asyncData: () => this.service.getCloseAccount(),
}
}
}
diff --git a/src/app/routes/ticket-management/components/input-invoice/edit-collection-invoice/edit-collection-invoice.component.ts b/src/app/routes/ticket-management/components/input-invoice/edit-collection-invoice/edit-collection-invoice.component.ts
index 2b3cd7bf..e91458f6 100644
--- a/src/app/routes/ticket-management/components/input-invoice/edit-collection-invoice/edit-collection-invoice.component.ts
+++ b/src/app/routes/ticket-management/components/input-invoice/edit-collection-invoice/edit-collection-invoice.component.ts
@@ -156,13 +156,14 @@ export class EditCollectionInvoiceComponent implements OnInit {
placeholder: '请输入'
}
},
- order2S2n: {
+ cno: {
type: 'string',
title: '结算客户',
ui: {
- widget: 'dict-select',
- params: { dictKey: 'refund:apply:status' },
- placeholder: '请选择'
+ widget: 'select',
+ placeholder: '请选择',
+ allowClear: true,
+ asyncData: () => this.service.getCloseAccount(),
}
},
createTime: {
diff --git a/src/app/routes/ticket-management/components/input-invoice/input-invoice-detail/input-invoice-detail.component.ts b/src/app/routes/ticket-management/components/input-invoice/input-invoice-detail/input-invoice-detail.component.ts
index 3492fc7f..384fa720 100644
--- a/src/app/routes/ticket-management/components/input-invoice/input-invoice-detail/input-invoice-detail.component.ts
+++ b/src/app/routes/ticket-management/components/input-invoice/input-invoice-detail/input-invoice-detail.component.ts
@@ -101,10 +101,11 @@ export class InputInvoiceDetailComponent implements OnInit {
cno: {
type: 'string',
title: '结算客户',
- enum: [{ label: '全部', value: '' }],
ui: {
widget: 'select',
- placeholder: '请选择'
+ placeholder: '请选择',
+ allowClear: true,
+ asyncData: () => this.service.getCloseAccount(),
},
default: ''
},
diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts
index 7703c38f..095e4192 100644
--- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts
+++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts
@@ -356,8 +356,8 @@ export class InvoiceRequestedComponent implements OnInit {
return [
{ title: '', index: 'key', type: 'checkbox' },
{ title: '申请编号', render: 'vatappcode', width: 180 },
- { title: '网络货运人', index: 'ltdName', width: 120 },
- { title: '购买方', index: 'arto', width: 90 },
+ { title: '网络货运人', index: 'ltdName', width: 150 },
+ { title: '购买方', index: 'artoName', width: 150 },
{ title: '订单数', index: 'ordlines', width: 90 },
{
title: '申请金额',
diff --git a/src/app/shared/services/business/shipper-base.service.ts b/src/app/shared/services/business/shipper-base.service.ts
index a824dcad..cd0fb364 100644
--- a/src/app/shared/services/business/shipper-base.service.ts
+++ b/src/app/shared/services/business/shipper-base.service.ts
@@ -12,6 +12,8 @@ export class ShipperBaseService extends BaseService {
$api_get_enterprise_project = `/api/mdc/cuc/enterpriseProject/getEnterpriseProjectList `; // 所属项目列表
$api_get_staff_list = `/api/mdc/cuc/userApp/getStaffList`; //查询企业项目员工列表(录单员)
$api_get_network_freight_forwarder_list = `/api/mdc/cuc/networkTransporter/findAll`; // 获取网络货运人
+ $api_get_settlement_customer_list = `/api/mdc/cuc/settlementCustomer/findAll`; // 查找所有结算客户信息(下拉)
+ $api_get_crm_customer_list = `/api/mdc/cuc/crmCustomer/findAll`; // 查找所有Crm客户信息(下拉)
$api_get_network_freight_forwarder_one = `/api/mdc/cuc/networkTransporter/get`; // 获取网络货运人
// 根据FullKey获取系统子配置(树)
$api_getSysConfigTreeByParentFullKey = `/api/mdc/pbc/sysConfig/getSysConfigTreeByParentFullKey`;
@@ -26,20 +28,18 @@ export class ShipperBaseService extends BaseService {
* @returns
*/
getCarlessCarrier() {
- const params = {
- };
+ const params = {};
return this.request(this.$api_get_carless_carrier, params, 'POST').pipe(
- map((res) => {
+ map(res => {
if (res) {
res.map((m: any) => {
return { label: m.platformName, value: m.operationId };
});
}
- }),
+ })
);
}
-
/**
* 获取所属项目
* @returns
@@ -50,99 +50,149 @@ export class ShipperBaseService extends BaseService {
if (!res) {
return [];
}
- const list = res.map(((item: any) => {
+ const list = res.map((item: any) => {
return {
label: item.projectName,
value: item.enterpriseId
- }
- }))
+ };
+ });
const obj = [{ value: '', label: '全部' }];
return [...obj, ...list];
})
- )
+ );
}
/**
* 获取录单员
* @returns
*/
- getStaffList(params = {},containerAll = true) {
+ getStaffList(params = {}, containerAll = true) {
return this.request(this.$api_get_staff_list, params).pipe(
map((res: any) => {
if (!res) {
return [];
}
- const list = res.map(((item: any) => {
+ const list = res.map((item: any) => {
return {
label: item.name,
value: item.appUserId
- }
- }))
+ };
+ });
const obj = [];
if (containerAll) {
- obj.push({ label: '全部', value: '' })
+ obj.push({ label: '全部', value: '' });
}
return [...obj, ...list];
})
- )
+ );
}
- /**
+ /**
* 获取调度员
* @returns
*/
- getStaffList2(params = {}) {
- return this.request(this.$api_get_staff_list, params).pipe(
- map((res: any) => {
- if (!res) {
- return [];
- }
- const list = res.map(((item: any) => {
- return {
- label: `${item.name}/${item.telephone}`,
- value: item.appUserId
- }
- }))
- return [...list];
- })
- )
- }
+ getStaffList2(params = {}) {
+ return this.request(this.$api_get_staff_list, params).pipe(
+ map((res: any) => {
+ if (!res) {
+ return [];
+ }
+ const list = res.map((item: any) => {
+ return {
+ label: `${item.name}/${item.telephone}`,
+ value: item.appUserId
+ };
+ });
+ return [...list];
+ })
+ );
+ }
/**
- * 获取网络货运人
- * @returns
- */
+ * 获取网络货运人
+ * @returns
+ */
getNetworkFreightForwarder(params = {}, containerAll = false) {
return this.request(this.$api_get_network_freight_forwarder_list, params).pipe(
map((res: any) => {
if (!res) {
return [];
}
- const list = res.map(((item: any) => {
+ const list = res.map((item: any) => {
return {
label: item.enterpriseName,
value: item.id
- }
- }))
+ };
+ });
const obj = [];
if (containerAll) {
- obj.push({ label: '全部', value: '' })
+ obj.push({ label: '全部', value: '' });
}
return [...obj, ...list];
})
- )
+ );
}
/**
- * 根据ID获取网络货运人
- * @returns
- */
+ * 获取CRM客户
+ * @returns
+ */
+ getCRM(params = {}, containerAll = false) {
+ return this.request(this.$api_get_crm_customer_list, params).pipe(
+ map((res: any) => {
+ if (!res) {
+ return [];
+ }
+ const list = res.map((item: any) => {
+ return {
+ label: item.customerName,
+ value: item.id
+ };
+ });
+ const obj = [];
+ if (containerAll) {
+ obj.push({ label: '全部', value: '' });
+ }
+ return [...obj, ...list];
+ })
+ );
+ }
+
+ /**
+ * 获取结算客户
+ * @returns
+ */
+ getCloseAccount(params = {}, containerAll = false) {
+ return this.request(this.$api_get_settlement_customer_list, params).pipe(
+ map((res: any) => {
+ if (!res) {
+ return [];
+ }
+ const list = res.map((item: any) => {
+ return {
+ label: item.customerName,
+ value: item.id
+ };
+ });
+ const obj = [];
+ if (containerAll) {
+ obj.push({ label: '全部', value: '' });
+ }
+ return [...obj, ...list];
+ })
+ );
+ }
+
+ /**
+ * 根据ID获取网络货运人
+ * @returns
+ */
getNetworkTransporterById(id: string) {
return this.request(this.$api_get_network_freight_forwarder_one, { id });
}
// 根据FullKey获取系统子配置(树)
- loadConfigByKey(configFullKey:string ='') {
+ loadConfigByKey(configFullKey: string = '') {
return this.http.post(this.$api_getSysConfigTreeByParentFullKey, { configFullKey }).pipe(
map((m: any) => {
if (m.success === true) {
@@ -151,7 +201,7 @@ export class ShipperBaseService extends BaseService {
this.msgSrv.warning(m.msg);
return [];
}
- }),
+ })
);
}
}