diff --git a/src/app/routes/order-management/components/bulk/bulk.component.ts b/src/app/routes/order-management/components/bulk/bulk.component.ts index 4c3acb07..15ba339a 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -334,7 +334,7 @@ export class OrderManagementBulkComponent implements OnInit { visibleIf: { _$expand: (value: boolean) => value }, - asyncData: () => this.shipperservice.getNetworkFreightForwarder() + asyncData: () => this.shipperservice.getNetworkEnterpriseName() } }, serviceType: { diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.ts index 5da24657..09e3ac81 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -306,7 +306,7 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme widget: 'select', placeholder: '请选择', allowClear: true, - asyncData: () => this.shipperservice.getNetworkFreightForwarder() + asyncData: () => this.shipperservice.getNetworkEnterpriseName() } }, // goodsNameId: { diff --git a/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.html b/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.html index 3c1b49fd..5c6ac9d3 100644 --- a/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.html +++ b/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.html @@ -5,7 +5,7 @@
this.service.getCRMCustomerId(), visibleIf: { expand: (value: boolean) => value } @@ -220,8 +223,8 @@ export class InputInvoiceComponent implements OnInit { private initST(): STColumn[] { return [ { title: '', index: 'key', type: 'checkbox', width: 60, className: 'text-center', fixed: 'left' }, - { title: '收票单号', index: 'inpinvcode', type: 'link', width: 170 }, - { title: '网络货运人', index: 'ltdName', width: 150 }, + { title: '收票单号', index: 'inpinvcode', type: 'link', width: 190 }, + { title: '网络货运人', index: 'ltdName', width: 220 }, { title: '发票日期', index: 'invdate', type: 'date', width: 150, className: 'text-center' }, { title: '发票号', index: 'invoiceno', width: 130 }, { @@ -241,7 +244,7 @@ export class InputInvoiceComponent implements OnInit { widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.invtax }) } }, { title: '发票类型', index: 'invtype', width: 150, className: 'text-center' }, - { title: '销售方', index: 'hrtoName', width: 150 }, + { title: '销售方', index: 'hrtoName', width: 200 }, { title: '创建时间', index: 'createtime', type: 'date', width: 150, className: 'text-center' }, { title: '创建人', index: 'createbyname', width: 120 }, { title: '收票状态', index: 'stsLabel', width: 120, className: 'text-center' }, diff --git a/src/app/shared/services/business/shipper-base.service.ts b/src/app/shared/services/business/shipper-base.service.ts index 6390cbd0..8713292a 100644 --- a/src/app/shared/services/business/shipper-base.service.ts +++ b/src/app/shared/services/business/shipper-base.service.ts @@ -124,6 +124,30 @@ export class ShipperBaseService extends BaseService { * @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) => { + return { + label: item.enterpriseName, + value: item.id + }; + }); + const obj = []; + if (containerAll) { + obj.push({ label: '全部', value: '' }); + } + return [...obj, ...list]; + }) + ); + } + /** + * 获取网络货运人 + * @returns + */ + getNetworkEnterpriseName(params = {}, containerAll = false) { return this.request(this.$api_get_network_freight_forwarder_list, params).pipe( map((res: any) => { if (!res) { @@ -169,6 +193,31 @@ export class ShipperBaseService extends BaseService { ); } + /** + * 获取CRM客户 crmCustomerId + * @returns + */ + getCRMCustomerId(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.enterpriseName, + value: item.crmCustomerId + }; + }); + const obj = []; + if (containerAll) { + obj.push({ label: '全部', value: '' }); + } + return [...obj, ...list]; + }) + ); + } + /** * 获取货主企业列表 * @returns