This commit is contained in:
Taric Xin
2022-03-25 17:44:53 +08:00
parent c00d41c25e
commit 07638e9ee2
7 changed files with 56 additions and 15 deletions

View File

@ -84,9 +84,11 @@ export class AdvanceCollectionComponent {
title: '付款人', title: '付款人',
ui: { ui: {
widget: 'select', widget: 'select',
placeholder: '请选择', serverSearch: true,
searchDebounceTime: 300,
searchLoadingText: '搜索中...',
allowClear: true, allowClear: true,
asyncData: () => this.service.getCRM() onSearch: (q: any) => this.service.getEnterpriceList({ enterpriseName: q })
} }
}, },
brmtype: { brmtype: {

View File

@ -151,9 +151,11 @@ export class ReceiptOrderComponent implements OnInit {
title: '付款人', title: '付款人',
ui: { ui: {
widget: 'select', widget: 'select',
placeholder: '请选择', serverSearch: true,
searchDebounceTime: 300,
searchLoadingText: '搜索中...',
allowClear: true, allowClear: true,
asyncData: () => this.service.getCRM(), onSearch: (q: any) => this.service.getEnterpriceList({ enterpriseName: q }),
visibleIf: { visibleIf: {
expand: (value: boolean) => value expand: (value: boolean) => value
} }

View File

@ -158,9 +158,11 @@ export class ReceivableOrderComponent implements OnInit {
title: '付款人', title: '付款人',
ui: { ui: {
widget: 'select', widget: 'select',
placeholder: '请选择', serverSearch: true,
searchDebounceTime: 300,
searchLoadingText: '搜索中...',
allowClear: true, allowClear: true,
asyncData: () => this.service.getCRM(), onSearch: (q: any) => this.service.getEnterpriceList({ enterpriseName: q }),
visibleIf: { visibleIf: {
expand: (value: boolean) => value expand: (value: boolean) => value
} }

View File

@ -2,9 +2,11 @@ import { CurrencyPipe } from '@angular/common';
import { Component, OnInit, ViewChild } from '@angular/core'; import { Component, OnInit, ViewChild } from '@angular/core';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { STComponent, STColumn, STRequestOptions, STChange } from '@delon/abc/st'; import { STComponent, STColumn, STRequestOptions, STChange } from '@delon/abc/st';
import { SFComponent, SFSchema, SFDateWidgetSchema, SFSelectWidgetSchema } from '@delon/form'; import { SFComponent, SFSchema, SFDateWidgetSchema, SFSelectWidgetSchema, SFSchemaEnum } from '@delon/form';
import { dateTimePickerUtil } from '@delon/util'; import { dateTimePickerUtil } from '@delon/util';
import { NzModalService } from 'ng-zorro-antd/modal'; import { NzModalService } from 'ng-zorro-antd/modal';
import { of } from 'rxjs';
import { map } from 'rxjs/operators';
import { TicketService } from '../../services/ticket.service'; import { TicketService } from '../../services/ticket.service';
import { RequestedInvoiceModalComponent } from '../invoice-requested/requested-invoice-modal/requested-invoice-modal.component'; import { RequestedInvoiceModalComponent } from '../invoice-requested/requested-invoice-modal/requested-invoice-modal.component';
import { PushInvoiceComponent } from './push-invoice/push-invoice.component'; import { PushInvoiceComponent } from './push-invoice/push-invoice.component';
@ -257,13 +259,16 @@ export class CancellationInvoiceComponent implements OnInit {
placeholder: '请输入' placeholder: '请输入'
} }
}, },
receiveName2: { arto: {
type: 'string', type: 'string',
title: '购买人', title: '购买人',
enum: [{ label: '全部', value: '全部' }],
ui: { ui: {
widget: 'select', widget: 'select',
placeholder: '请选择' serverSearch: true,
searchDebounceTime: 300,
searchLoadingText: '搜索中...',
allowClear: true,
onSearch: (q: any) => this.service.getEnterpriceList({ enterpriseName: q })
} }
}, },
ltdId: { ltdId: {

View File

@ -385,12 +385,14 @@ export class InvoiceRequestedComponent {
title: '货主名称', title: '货主名称',
ui: { ui: {
widget: 'select', widget: 'select',
placeholder: '请选择', serverSearch: true,
searchDebounceTime: 300,
searchLoadingText: '搜索中...',
allowClear: true, allowClear: true,
onSearch: (q: any) => this.service.getEnterpriceList({ enterpriseName: q }),
visibleIf: { visibleIf: {
expand: (value: boolean) => value expand: (value: boolean) => value
}, }
asyncData: () => this.service.getCRM()
} }
} }
} }

View File

@ -32,7 +32,6 @@ export class RequestedDetailComponent implements OnInit {
initData() { initData() {
if(this.id) { if(this.id) {
this.service.request(this.service.$api_get_invoice_requested_header_detail, { id: this.id }).subscribe(res => { this.service.request(this.service.$api_get_invoice_requested_header_detail, { id: this.id }).subscribe(res => {
console.log(res);
if (res) { if (res) {
this.headerInfo = res; this.headerInfo = res;
} }
@ -40,7 +39,6 @@ export class RequestedDetailComponent implements OnInit {
} }
if(this.Id) { if(this.Id) {
this.service.request(this.service.$api_get_invoice_requested_header_detail, { id: this.Id }).subscribe(res => { this.service.request(this.service.$api_get_invoice_requested_header_detail, { id: this.Id }).subscribe(res => {
console.log(res);
if (res) { if (res) {
this.headerInfo = res; this.headerInfo = res;
} }

View File

@ -23,6 +23,9 @@ export class ShipperBaseService extends BaseService {
$api_get_rebate_config = `/api/mdc/rebateConfig/list/listRebateConfig`; $api_get_rebate_config = `/api/mdc/rebateConfig/list/listRebateConfig`;
// 获取渠道销售管理集合 // 获取渠道销售管理集合
$api_get_channel = `/api/mdc/channelSalesManagement/list/listChannelSalesManagement`; $api_get_channel = `/api/mdc/channelSalesManagement/list/listChannelSalesManagement`;
// 获取货主企业列表
public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList';
constructor(public injector: Injector) { constructor(public injector: Injector) {
super(injector); super(injector);
} }
@ -166,6 +169,33 @@ export class ShipperBaseService extends BaseService {
); );
} }
/**
* 获取货主企业列表
* @returns
*/
getEnterpriceList(params = { enterpriseName: '' }, containerAll = false) {
let str = params.enterpriseName.replace(/^\s+|\s+$/g, '');
if (str) {
return this.request(this.$api_enterpriceList, 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];
})
).toPromise();;
} else {
return of([]);
}
}
/** /**
* 获取结算客户 * 获取结算客户
* @returns * @returns