diff --git a/src/app/routes/contract-management/components/contract-list/contract-list.component.ts b/src/app/routes/contract-management/components/contract-list/contract-list.component.ts index 24e61caa..69937f22 100644 --- a/src/app/routes/contract-management/components/contract-list/contract-list.component.ts +++ b/src/app/routes/contract-management/components/contract-list/contract-list.component.ts @@ -174,7 +174,7 @@ export class ContractManagementContractListComponent implements OnInit { ui: { widget: 'dict-select', containsAllLable: true, - params: { dictKey: 'contract:document:type' }, + params: { dictKey: 'goodresource:type' }, containAllLable:true, visibleIf: { _$expand: (value: boolean) => value, diff --git a/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts b/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts index 5d71ae62..e94ae430 100644 --- a/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts +++ b/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts @@ -128,7 +128,7 @@ export class ContractManagementTemplateTextComponent implements OnInit { default: '', ui: { widget: 'dict-select', - params: { dictKey: 'contract:template:type' }, + params: { dictKey: 'goodresource:type' }, containsAllLable: true, visibleIf: { templateType: value => value === 'MX' diff --git a/src/app/routes/contract-management/components/contract-template-frame/contract-template-frame.component.ts b/src/app/routes/contract-management/components/contract-template-frame/contract-template-frame.component.ts index 88032596..9ab02d99 100644 --- a/src/app/routes/contract-management/components/contract-template-frame/contract-template-frame.component.ts +++ b/src/app/routes/contract-management/components/contract-template-frame/contract-template-frame.component.ts @@ -105,7 +105,7 @@ export class ContractManagementTemplateFrameComponent implements OnInit { default: '', ui: { widget: 'dict-select', - params: { dictKey: 'contract:template:type' }, + params: { dictKey: 'goodresource:type' }, containsAllLable: true, visibleIf: { _$expand: (value: boolean) => value diff --git a/src/app/routes/contract-management/components/contract-template-partner/contract-template-partner.component.ts b/src/app/routes/contract-management/components/contract-template-partner/contract-template-partner.component.ts index c637a8cc..d457c780 100644 --- a/src/app/routes/contract-management/components/contract-template-partner/contract-template-partner.component.ts +++ b/src/app/routes/contract-management/components/contract-template-partner/contract-template-partner.component.ts @@ -105,7 +105,7 @@ export class ContractManagementTemplatePartnerComponent implements OnInit { default: '', ui: { widget: 'dict-select', - params: { dictKey: 'contract:template:type' }, + params: { dictKey: 'goodresource:type' }, containsAllLable: true, visibleIf: { _$expand: (value: boolean) => value diff --git a/src/app/routes/contract-management/components/contract-template/contract-template.component.ts b/src/app/routes/contract-management/components/contract-template/contract-template.component.ts index 1ca1a321..751e3787 100644 --- a/src/app/routes/contract-management/components/contract-template/contract-template.component.ts +++ b/src/app/routes/contract-management/components/contract-template/contract-template.component.ts @@ -105,7 +105,7 @@ export class ContractManagementTemplateDetailComponent implements OnInit { default: '', ui: { widget: 'dict-select', - params: { dictKey: 'contract:template:type' }, + params: { dictKey: 'goodresource:type' }, containsAllLable: true, visibleIf: { _$expand: (value: boolean) => value diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html index 4b2384b3..f3554eaf 100644 --- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html +++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html @@ -236,10 +236,9 @@
diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts index 64abc0a9..a7d80756 100644 --- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts +++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts @@ -1,5 +1,7 @@ import { Component, OnInit, ViewChild } from '@angular/core'; +import { debounceTime } from 'rxjs/operators'; import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; +import { Subject } from 'rxjs'; import { ActivatedRoute, Router } from '@angular/router'; import { SFCheckboxWidgetSchema, @@ -48,6 +50,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { startInfo: any = []; // 发货地数据 endInfo: any = []; // 卸货地数据 PageStatus = ''; + changeSub = new Subject(); envCache: any; enterpriseProjectIds: any; constructor( @@ -125,6 +128,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { this.initSF6(); this.initSF7(); this.initdata(); + this.getInsurers() } initSF1() { this.schema1 = { @@ -1290,30 +1294,54 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { }); } } - getInsurersPrice($event: any) { + getInsurersPrice($event?: any) { console.log($event); - - console.log(this.sf5.value.goodsValue) - console.log(this.sf5.value.insuranceType) - if (this.sf5.value.goodsValue >= 50000) { - if(this.totalDistance <=0){ - this.service.msgSrv.warning('当前装卸货距离为0,无法计算保价费金额'); - return; - } - const params = { - goodsValue: this.sf5.value.goodsValue, - insuranceType: this.sf5.value.insuranceType, - km: this.totalDistance - }; - this.service.request(this.service.$api_getWholeInsuranceInfo, params).subscribe(res => { - if (res) { - this.sf5.setValue('/insurancePremium', res.insurancePremium); - this.sf5.setValue('/insuranceRate', res.insuranceRate); - } else { - this.sf5.setValue('/insurancePremium', null); - this.sf5.setValue('/insuranceRate', null); - } - }); - } + this.changeSub.next(`${$event}`); + + } + getInsurers($event?: any) { + this.changeSub.pipe(debounceTime(500)).subscribe((res: any) => { + console.log(res) + if (res) { + console.log(res) + if(res > 3000000 ) { + console.log('1111') + this.sf5.getProperty('/goodsValue')!.widget.reset(3000000); + this.sf5.setValue('/goodsValue', 3000000); + this.service.msgSrv.error('请输入50000-3000000之间数值!') + } + if(res < 50000) { + // this.sf5.setValue('/goodsValue', 50000); + this.sf5.getProperty('/goodsValue')!.widget.reset(50000); + this.sf5.setValue('/goodsValue', 50000); + + console.log('2222') + this.service.msgSrv.error('请输入50000-3000000之间数值!') + } + if (this.sf5.value.goodsValue >= 50000) { + if(this.totalDistance <=0){ + this.service.msgSrv.warning('当前装卸货距离为0,无法计算保价费金额'); + return; + } + const params = { + goodsValue: this.sf5.value.goodsValue, + insuranceType: this.sf5.value.insuranceType, + km: this.totalDistance + }; + this.service.request(this.service.$api_getWholeInsuranceInfo, params).subscribe(res => { + if (res) { + this.sf5.setValue('/insurancePremium', res.insurancePremium); + this.sf5.setValue('/insuranceRate', res.insuranceRate); + } else { + this.sf5.setValue('/insurancePremium', null); + this.sf5.setValue('/insuranceRate', null); + } + }); + } + } + + }); + } + } diff --git a/src/app/shared/components/insurance-table/insurance-table.component.ts b/src/app/shared/components/insurance-table/insurance-table.component.ts index 6589d8ef..b97c52bd 100644 --- a/src/app/shared/components/insurance-table/insurance-table.component.ts +++ b/src/app/shared/components/insurance-table/insurance-table.component.ts @@ -93,10 +93,6 @@ export class InsuranceTableComponent implements OnInit { * @param i 下标 */ changeEndKm(event: any, i: number) { - // console.log(this.debounce4(event, i)); - // console.log(this.data[i].startKm); - // console.log(event); - // console.log(i); if (event) { console.log(event);