diff --git a/src/app/routes/sys-setting/components/network-freight/network-freight.component.ts b/src/app/routes/sys-setting/components/network-freight/network-freight.component.ts index 5456947b..a334b188 100644 --- a/src/app/routes/sys-setting/components/network-freight/network-freight.component.ts +++ b/src/app/routes/sys-setting/components/network-freight/network-freight.component.ts @@ -1,7 +1,15 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { STComponent, STColumn, STChange } from '@delon/abc/st'; -import { SFCascaderWidgetSchema, SFComponent, SFRadioWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form'; +import { + SFCascaderWidgetSchema, + SFComponent, + SFRadioWidgetSchema, + SFSchema, + SFSchemaEnum, + SFSelectWidgetSchema, + SFUISchema +} from '@delon/form'; import { DynamicSettingModalComponent, SinglepageSettingModalComponent } from '@shared'; import { NzModalService } from 'ng-zorro-antd/modal'; import { of } from 'rxjs'; @@ -32,10 +40,10 @@ export class NetworkFreightComponent implements OnInit { ticketSchema: SFSchema = {}; TaxSchema: SFSchema = {}; NCSchema: SFSchema = {}; - _$expand :boolean= false; - taxStatus :boolean= false; - TicketStatus :boolean= true; - NCStatus :boolean = false; + _$expand: boolean = false; + taxStatus: boolean = false; + TicketStatus: boolean = true; + NCStatus: boolean = false; formData: any; ticketId: any; ticketItem: any; @@ -117,29 +125,28 @@ export class NetworkFreightComponent implements OnInit { fixed: 'right', className: 'text-center', buttons: [ + { type: 'divider' }, { - text: '基础设置', + text: '基础设置
', click: item => this.creat(item) }, { - text: '财务设置', + text: '财务设置
', click: item => this.ticket(item) }, { - text: '充值账户', + text: '充值账户
', click: item => this.settingPay(item) }, { - text: '应用设置', + text: '应用设置
', click: item => this.settingApp(item) }, { - text: '系统配置', + text: '系统配置
', click: item => this.settingAction(item) }, - { type: 'divider' }, - // { // text: '合同设置', // click: item => this.roleAction(item, 2) @@ -337,9 +344,9 @@ export class NetworkFreightComponent implements OnInit { 'drawer' ] }; - this.ui3 = { - '*': { spanLabelFixed: 150, grid: { span: 24 } }, - '$taxClassificationVersion': { spanLabelFixed: 150, grid: { span: 24 } }, + this.ui3 = { + '*': { spanLabelFixed: 150, grid: { span: 24 } }, + $taxClassificationVersion: { spanLabelFixed: 150, grid: { span: 24 } } }; } initSFTax() { @@ -377,7 +384,7 @@ export class NetworkFreightComponent implements OnInit { let str = q.replace(/^\s+|\s+$/g, ''); if (str) { console.log(str); - + return this.service .request(this.service.$api_get_crmCustomer_page, { customerName: str }) .pipe(map((res: any) => (res.records as any[]).map(i => ({ label: i.customerName, value: i.id } as SFSchemaEnum)))) @@ -387,12 +394,11 @@ export class NetworkFreightComponent implements OnInit { } } } as SFSelectWidgetSchema - }, + } }, required: ['crmCustomerId'] }; this.ui5 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } }; - } initSFFre() { this.addSchema = { @@ -444,16 +450,16 @@ export class NetworkFreightComponent implements OnInit { this.formDataNC = []; this.formDataTax = []; this.ticketItem = value; - this.taxStatus = false - this.TicketStatus = true - this.NCStatus = false + this.taxStatus = false; + this.TicketStatus = true; + this.NCStatus = false; this.initSFTax(); this.initSFNC(); this.initSFTicket(); this.NCID = value.id; - if(this.TicketStatus) { + if (this.TicketStatus) { console.log('9999999'); - + this.service.request(this.service.$api_getTicketByNetworkTransporterId, { id: value.id }).subscribe((res: any) => { console.log(res); if (res) { @@ -466,8 +472,8 @@ export class NetworkFreightComponent implements OnInit { } }); } - if(this.NCStatus) { - this.getNcSetData() + if (this.NCStatus) { + this.getNcSetData(); } this.isVisibleTicket = true; } @@ -477,12 +483,12 @@ export class NetworkFreightComponent implements OnInit { this.service.request(this.service.$api_get_crmCustomer, { id: this.ticketItem.crmCustomerId }).subscribe((res: any) => { console.log(res); if (res) { - List.push({ label: res.customerName, value: res.id }); - console.log(List); - - this.sfNC.getProperty('/crmCustomerId')!.schema.enum = List; - this.sfNC.getProperty('/crmCustomerId')!.widget.reset(List); - this.sfNC.setValue('/crmCustomerId', res?.id); + List.push({ label: res.customerName, value: res.id }); + console.log(List); + + this.sfNC.getProperty('/crmCustomerId')!.schema.enum = List; + this.sfNC.getProperty('/crmCustomerId')!.widget.reset(List); + this.sfNC.setValue('/crmCustomerId', res?.id); } }); } @@ -493,7 +499,7 @@ export class NetworkFreightComponent implements OnInit { regioin?.forEach((element: any) => { enterpriseAddressCode.push(Number(element)); }); - if(this.TicketStatus) { + if (this.TicketStatus) { this.sfTicket.setValue('/senderRegionCode', enterpriseAddressCode); return enterpriseAddressCode; } @@ -587,11 +593,11 @@ export class NetworkFreightComponent implements OnInit { this.isVisibleTicket = false; } handleOKTicket() { - console.log( this.taxStatus, this.TicketStatus,this.NCStatus); - if(this.TicketStatus) { + console.log(this.taxStatus, this.TicketStatus, this.NCStatus); + if (this.TicketStatus) { console.log(this.sfTicket); console.log(this.sfTicket.value); - + if (!this.sfTicket.valid) { this.service.msgSrv.warning('请正确填写完整!'); return; @@ -611,11 +617,11 @@ export class NetworkFreightComponent implements OnInit { this.st.reload(1); } }); - } else if(this.NCStatus){ + } else if (this.NCStatus) { console.log(this.sfNC); console.log(this.formDataNC); console.log(this.sfNC?.value); - + if (!this.sfNC.valid) { this.service.msgSrv.warning('请正确填写完整!'); return; @@ -636,7 +642,6 @@ export class NetworkFreightComponent implements OnInit { }); // api_setCrmCustomer } - } handleOK() { @@ -674,12 +679,12 @@ export class NetworkFreightComponent implements OnInit { this.taxStatus = true; this.TicketStatus = false; this.NCStatus = false; - } else if (value.name === '开票设置'){ + } else if (value.name === '开票设置') { this.TicketStatus = true; this.NCStatus = false; this.taxStatus = false; - } else if (value.name === 'NC设置'){ - this.getNcSetData() + } else if (value.name === 'NC设置') { + this.getNcSetData(); this.NCStatus = true; this.TicketStatus = false; this.taxStatus = false;