Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
wangshiming
2022-02-11 10:26:36 +08:00
parent 50ab4e4747
commit 57e2efca94
2 changed files with 106 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

146
src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
View File

@ -14,6 +14,7 @@ import {
import { _HttpClient } from '@delon/theme';
import { AmapPoiPickerComponent, AmapService, ShipperBaseService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
import { type } from 'os';
import { of } from 'rxjs';
import { map } from 'rxjs/operators';
import { SupplyManagementService } from '../../services/supply-management.service';
@ -61,10 +62,10 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
this.validateForm1 = fb.group({
loadAddress0: [null, [Validators.required]],
loadName0: [null, [Validators.required]],
loadPhone0: [null, [Validators.required,Validators.pattern('^[0-9]*$')]],
loadPhone0: [null, [Validators.required, Validators.pattern('^[0-9]*$')]],
unloadAddress0: [null, [Validators.required]],
unloadName0: [null, [Validators.required]],
unloadPhone0: [null, [Validators.required,Validators.pattern('^[0-9]*$')]],
unloadPhone0: [null, [Validators.required, Validators.pattern('^[0-9]*$')]],
loadingTime: [null, []],
unloadingTime: [null, []]
});
@ -377,29 +378,29 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
ui: {
widget: 'select'
},
default:'0'
default: '0'
},
type1: {
type: 'string',
title: '',
enum: ['车辆实时定位', '轨迹查询', '数据保护','赠送基本险'],
enum: ['车辆实时定位', '轨迹查询', '数据保护', '赠送基本险'],
readOnly: true,
ui: {
widget: 'checkbox',
visibleIf: {insuranceType: (value: string) => value ==='1'},
visibleIf: { insuranceType: (value: string) => value === '1' }
} as SFCheckboxWidgetSchema,
default: ['车辆实时定位', '轨迹查询', '数据保护','赠送基本险'],
default: ['车辆实时定位', '轨迹查询', '数据保护', '赠送基本险']
},
type2: {
type: 'string',
title: '',
enum: ['车辆实时定位', '轨迹查询', '数据保护','专属技术服务','赠送综合险'],
enum: ['车辆实时定位', '轨迹查询', '数据保护', '专属技术服务', '赠送综合险'],
readOnly: true,
ui: {
widget: 'checkbox',
visibleIf: {insuranceType: (value: string) => value ==='2'},
visibleIf: { insuranceType: (value: string) => value === '2' }
} as SFCheckboxWidgetSchema,
default: ['车辆实时定位', '轨迹查询', '数据保护','专属技术服务','赠送综合险'],
default: ['车辆实时定位', '轨迹查询', '数据保护', '专属技术服务', '赠送综合险']
}
}
};
@ -478,7 +479,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
visibleIf: {
receiptType: value => value === '2'
}
},
}
},
receiptUserPhone: {
type: 'string',
@ -488,7 +489,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
visibleIf: {
receiptType: value => value === '2'
}
},
}
},
receiptAddressArea: {
type: 'string',
@ -498,7 +499,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
visibleIf: {
receiptType: value => value === '2'
}
},
}
},
receiptAddress: {
type: 'string',
@ -508,7 +509,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
visibleIf: {
receiptType: value => value === '2'
}
},
}
},
remarks: {
type: 'string',
@ -521,7 +522,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
} as SFTextareaWidgetSchema
}
},
required: ['stateReceipt', 'receiptType', 'receiptUserName','receiptUserPhone','receiptAddressArea','receiptAddress']
required: ['stateReceipt', 'receiptType', 'receiptUserName', 'receiptUserPhone', 'receiptAddressArea', 'receiptAddress']
};
this.ui6 = {
'*': {
@ -551,11 +552,11 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
minimum: 0,
maximum: 999999,
default: 0,
ui: {
ui: {
prefix: '￥',
widgetWidth: 300,
change: _args => this.payChange()
} as SFNumberWidgetSchema
change: _args => this.payChange()
} as SFNumberWidgetSchema
},
// oilCardPay: {
// type: 'number',
@ -563,7 +564,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
// minimum: 0,
// maximum: 999999,
// default: 0,
// ui: {
// ui: {
// prefix: '￥',
// widgetWidth: 300,
// change: _args => this.payChange()
@ -575,11 +576,11 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
minimum: 0,
maximum: 999999,
default: 0,
ui: {
prefix: '￥',
widgetWidth: 300,
change: _args => this.payChange()
} as SFNumberWidgetSchema
ui: {
prefix: '￥',
widgetWidth: 300,
change: _args => this.payChange()
} as SFNumberWidgetSchema
},
subtotal: { type: 'number', title: '小计', default: 0, ui: { widget: 'custom' } as SFNumberWidgetSchema },
appendFee: { type: 'number', title: '附加费', default: 0, ui: { widget: 'custom' } as SFNumberWidgetSchema },
@ -626,7 +627,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
}
changeValue() {
this.totalFees =
Number(this.sf7?.value?.appendFee) +
Number(this.sf7?.value?.appendFee) +
Number(this.sf7?.value?.prePay) +
Number(this.sf7?.value?.receiptPay) +
Number(this.sf7?.value?.toPay);
@ -636,10 +637,10 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
let subtotal: any = {};
let oilCardPay: any = 0;
if (value) {
subtotal = value.prePay + value.toPay + value.receiptPay || 0;
subtotal = value.prePay + value.toPay + value.receiptPay || 0;
// oilCardPay = value.oilCardPay || 0;
} else {
subtotal = this.sf7.value.prePay + this.sf7.value.toPay+ this.sf7.value.receiptPay || 0;
subtotal = this.sf7.value.prePay + this.sf7.value.toPay + this.sf7.value.receiptPay || 0;
// oilCardPay = this.sf7.value.oilCardPay || 0;
}
console.log(this.sf7.value);
@ -827,7 +828,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
if (this.validateForm1.invalid || !this.sf3.valid || !this.sf1.valid || !this.sf4.valid || !this.sf6.valid || !this.sf7.valid) {
return;
}
console.log(this.validateForm1.value?.unloadingTime)
console.log(this.validateForm1.value?.unloadingTime);
if (typeof this.validateForm1.value.unloadingTime !== 'string') {
var c = new Date(this.validateForm1.value.unloadingTime);
this.validateForm1.value.unloadingTime =
@ -866,7 +867,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
loadingTime: this.validateForm1?.value?.loadingTime,
unloadingTime: this.validateForm1?.value?.unloadingTime,
unLoadingPlaceDTOList: [...this.startInfo, ...this.endInfo],
insuranceType:this.sf55.value.insuranceType,
insuranceType: this.sf55.value.insuranceType,
goodsInfoDTOList: [
{
...this.sf4.value,
@ -1087,10 +1088,23 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
};
if (res?.loadingTime) {
this.loadingTime = res?.loadingTime;
// this.validateForm1.patchValue(
// {
// loadingTime: res?.loadingTime,
// },
// { onlySelf: true },
// );
}
if (res?.unloadingTime) {
this.unloadingTime = res?.unloadingTime;
// this.validateForm1.patchValue(
// {
// unloadingTime: res?.unloadingTime,
// },
// { onlySelf: true },
// );
}
if (this.PageStatus === '整车修改') {
this.sf4data.id = res?.goodsInfoVOList[0]?.id;
}
@ -1171,54 +1185,42 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
}
});
}
changeUn(value: any) {
console.log(value)
if (typeof value !== 'string') {
var c = new Date(value);
value =
c.getFullYear() +
'-' +
this.addPreZero(c.getMonth() + 1) +
'-' +
this.addPreZero(c.getDate()) +
' ' +
this.addPreZero(c.getHours()) +
':' +
this.addPreZero(c.getMinutes()) +
':' +
this.addPreZero(c.getSeconds());
changeUn(event: Date) {
this.unloadingTime = event;
console.log(this.unloadingTime );
console.log(this.unloadingTime.getTime() );
if(typeof this.loadingTime === 'string') {
var a = new Date(this.loadingTime)
if ( a > this.unloadingTime.getTime() ) {
this.service.msgSrv.error('卸货时间不能小于装货时间！');
this.unloadingTime = '';
console.log(this.unloadingTime)
}
console.log(value)
console.log(this.loadingTime)
console.log(this.loadingTime > value)
if(this.loadingTime > value) {
console.log('错误')
this.unloadingTime = ''
} else {
if ( this.loadingTime.getTime() > this.unloadingTime.getTime() ) {
this.service.msgSrv.error('卸货时间不能小于装货时间！');
this.unloadingTime = '';
}
}
changeLO(value: any) {
console.log(value)
if (typeof value !== 'string') {
var c = new Date(value);
value =
c.getFullYear() +
'-' +
this.addPreZero(c.getMonth() + 1) +
'-' +
this.addPreZero(c.getDate()) +
' ' +
this.addPreZero(c.getHours()) +
':' +
this.addPreZero(c.getMinutes()) +
':' +
this.addPreZero(c.getSeconds());
}
console.log(value)
}
changeLO(event: Date) {
this.loadingTime = event;
console.log(this.loadingTime.getTime() );
console.log(this.unloadingTime)
console.log(this.unloadingTime < value)
if(this.unloadingTime < value) {
console.log('错误')
this.loadingTime = ''
console.log( typeof this.unloadingTime)
if(typeof this.unloadingTime === 'string') {
var a = new Date(this.unloadingTime)
if ( a.getTime()< this.loadingTime.getTime()) {
console.log('错误');
this.service.msgSrv.error('装货时间不能大于卸货时间！');
this.loadingTime = '';
}
} else {
if ( this.unloadingTime.getTime()< this.loadingTime.getTime()) {
console.log('错误');
this.service.msgSrv.error('装货时间不能大于卸货时间！');
this.loadingTime = '';
}
}
}
}