初步联调货源

This commit is contained in:
wangshiming
2021-12-09 00:12:53 +08:00
parent e94c4486ea
commit 5dcc2d0b4b
6 changed files with 199 additions and 77 deletions

View File

@ -7,7 +7,7 @@
</page-header-wrapper>
<nz-card>
<div class="card-title">货源单设置</div>
<sf #sf1 [schema]="schema1" [formData]="dataList" [button]="'none'" [ui]="ui1"></sf>
<sf #sf1 [schema]="schema1" [formData]="sf1data" [button]="'none'" [ui]="ui1"></sf>
</nz-card>
<nz-card>
@ -21,13 +21,13 @@
<nz-form-control [nzErrorTip]="'请输入装货地'">
<div class="align-center">
<nz-input-group [nzSuffix]="endInconTemp1">
<input nz-input [(ngModel)]="data.address" [ngModelOptions]="{ standalone: true }" />
<input nz-input [(ngModel)]="data.detailedAddress" [ngModelOptions]="{ standalone: true }" />
</nz-input-group>
<span style="padding: 0 10px"
><i nz-icon nzType="menu" nzTheme="outline" style="color: #1890ff" (click)="openMap()"></i
></span>
<span *ngIf="idx !== 0"
><i nz-icon nzType="minus-circle-o" nzTheme="fill" style="color: #d9001b" (click)="subStartInfo($event, idx)"></i
><i nz-icon nzType="minus-circle-o" nzTheme="fill" style="color: #d9001b" (click)="subStartInfo($event, idx)">X</i
></span>
</div>
</nz-form-control>
@ -36,8 +36,8 @@
<nz-form-label [nzSpan]="4" nzRequired>联系人</nz-form-label>
<nz-form-control [nzErrorTip]="'请输入联系人信息'">
<div class="align-center">
<input nz-input [(ngModel)]="data.name" [ngModelOptions]="{ standalone: true }" maxlength="30" />
<input style="margin-left: 12px" nz-input [(ngModel)]="data.phone" [ngModelOptions]="{ standalone: true }" maxlength="11" />
<input nz-input [(ngModel)]="data.appUserName" [ngModelOptions]="{ standalone: true }" maxlength="30" />
<input style="margin-left: 12px" nz-input [(ngModel)]="data.contractTelephone" [ngModelOptions]="{ standalone: true }" maxlength="11" />
</div>
</nz-form-control>
</nz-form-item>
@ -59,7 +59,7 @@
<nz-form-control [nzErrorTip]="'请输入卸货地'">
<div class="align-center">
<nz-input-group [nzSuffix]="endInconTemp1">
<input nz-input [(ngModel)]="data.address" [ngModelOptions]="{ standalone: true }" />
<input nz-input [(ngModel)]="data.detailedAddress" [ngModelOptions]="{ standalone: true }" />
</nz-input-group>
<span style="padding: 0 10px"><i nz-icon nzType="menu" nzTheme="outline" style="color: #1890ff"></i></span>
<span *ngIf="idx !== 0"
@ -72,8 +72,8 @@
<nz-form-label [nzSpan]="4" nzRequired>联系人</nz-form-label>
<nz-form-control [nzErrorTip]="'请输入联系人信息'">
<div class="align-center">
<input nz-input [(ngModel)]="data.name" [ngModelOptions]="{ standalone: true }" maxlength="30" />
<input style="margin-left: 12px" nz-input [(ngModel)]="data.phone" [ngModelOptions]="{ standalone: true }" maxlength="11" />
<input nz-input [(ngModel)]="data.appUserName" [ngModelOptions]="{ standalone: true }" maxlength="30" />
<input style="margin-left: 12px" nz-input [(ngModel)]="data.contractTelephone" [ngModelOptions]="{ standalone: true }" maxlength="11" />
</div>
</nz-form-control>
</nz-form-item>
@ -89,7 +89,7 @@
<nz-form-item>
<nz-form-label [nzSpan]="4" nzRequired>装货时间</nz-form-label>
<nz-form-control [nzErrorTip]="'请输入装货时间'">
<nz-date-picker nzShowTime nzFormat="yyyy-MM-dd HH:mm:ss" formControlName="name1"></nz-date-picker>
<nz-date-picker nzShowTime nzFormat="yyyy-MM-dd HH:mm:ss" formControlName="createTime" [(ngModel)]="creatTime"></nz-date-picker>
</nz-form-control>
</nz-form-item>
</div>
@ -97,7 +97,7 @@
<nz-form-item>
<nz-form-label [nzSpan]="9" nzRequired>卸货时间</nz-form-label>
<nz-form-control [nzErrorTip]="'请输入卸货时间'">
<nz-date-picker nzShowTime nzFormat="yyyy-MM-dd HH:mm:ss" formControlName="name2"></nz-date-picker>
<nz-date-picker nzShowTime nzFormat="yyyy-MM-dd HH:mm:ss" formControlName="modifyTime" [(ngModel)]="modifyTime"></nz-date-picker>
</nz-form-control>
</nz-form-item>
</div>
@ -110,14 +110,14 @@
<div class="card-title">货物信息</div>
<div nz-row>
<div nz-col nzSpan="12">
<sf #sf3 [schema]="schema3" [button]="'none'" [ui]="ui3"></sf>
<sf #sf4 [schema]="schema4" [button]="'none'" [ui]="ui4">
<ng-template sf-template="name3" let-i let-ui="ui">
<sf #sf3 [schema]="schema3" [formData]="sf3data" [button]="'none'" [ui]="ui3"></sf>
<sf #sf4 [schema]="schema4" [formData]="sf4data" [button]="'none'" [ui]="ui4">
<ng-template sf-template="weight" let-i let-ui="ui">
<nz-input-group nzAddOnAfter="吨">
<input nz-input [ngModel]="i.value" (ngModelChange)="i.setValue($event)" />
</nz-input-group>
</ng-template>
<ng-template sf-template="name4" let-i let-ui="ui">
<ng-template sf-template="volume" let-i let-ui="ui">
<nz-input-group nzAddOnAfter="方">
<input nz-input [ngModel]="i.value" (ngModelChange)="i.setValue($event)" />
</nz-input-group>
@ -140,14 +140,20 @@
<ng-template #template1>推荐投保,填写货值自动估保费,司机接单后不可退保。详见<a>《投保告知》</a></ng-template>
<div nz-row>
<div nz-col nzSpan="12">
<sf #sf5 [schema]="schema5" [button]="'none'" [ui]="ui5">
<ng-template sf-template="name1" let-i let-ui="ui">
<sf #sf5 [schema]="schema5" [formData]="sf5data" [button]="'none'" [ui]="ui5">
<ng-template sf-template="goodsValue" let-i let-ui="ui">
<div class="align-center">
<input nz-input [ngModel]="i.value" (ngModelChange)="i.setValue($event)" />
<span style="padding: 0 12px" nz-tooltip [nzTooltipTitle]="template2"
><i nz-icon nzType="exclamation-circle" nzTheme="outline" style="color: #1890ff"></i
></span>
<ng-template #template2>注意事项:.......</ng-template>
<ng-template #template2>注意事项<br/>
①请仔细阅读《投保告知》<br/>
②港澳台、西藏不在投保范围内,不予承保<br/>
③保价费最低收费2元请按真实货值填写录入的所有信息必须确保真实不如实录入的内容不承担对应赔偿责任。</ng-template>
</div>
</ng-template>
</sf>
@ -159,7 +165,7 @@
<div class="card-title">补充信息</div>
<div nz-row>
<div nz-col nzSpan="12">
<sf #sf6 [schema]="schema6" [button]="'none'" [ui]="ui6"></sf>
<sf #sf6 [schema]="schema6" [formData]="sf6data" [button]="'none'" [ui]="ui6"></sf>
</div>
</div>
</nz-card>
@ -168,7 +174,7 @@
<div class="card-title">运费信息</div>
<div nz-row>
<div nz-col nzSpan="12">
<sf #sf7 [schema]="schema7" [button]="'none'" [ui]="ui7">
<sf #sf7 [schema]="schema7" [formData]="sf7data" [button]="'none'" [ui]="ui7">
<ng-template sf-template="name5" let-i let-ui="ui">¥0.00</ng-template>
<ng-template sf-template="name6" let-i let-ui="ui">¥0.00</ng-template>
<ng-template sf-template="name7" let-i let-ui="ui">¥0.00</ng-template>

View File

@ -22,31 +22,26 @@ import { SupplyManagementService } from '../../services/supply-management.servic
export class SupplyManagementOnecarPublishComponent implements OnInit {
validateForm1: FormGroup;
newTempchecked = false; //是否存入新模板
sf1data: any; // 货源单设置回显
sf3data: any; // 货源单设置回显
sf4data: any; // 货源单设置回显
sf5data: any; // 货源单设置回显
sf6data: any; // 货源单设置回显
sf7data: any; // 货源单设置回显
creatTime: any; // 货源单设置回显
modifyTime: any; // 货源单设置回显
id = this.route.snapshot.params.id;
// // 单位
unit1 = '吨';
unit2 = '方';
unit3 = '保价费金额';
startInfo: any[] = [
{
addresss: '深圳',
name: '张三',
phone: '18888888888'
}
];
endInfo: any[] = [
{
addresss: '深圳',
name: '张三',
phone: '18888888888'
}
];
startInfo: any = [];
endInfo: any = [];
dataList: any;
constructor(private http: _HttpClient, fb: FormBuilder, private router: Router, private route: ActivatedRoute, private modalService: NzModalService, public service: SupplyManagementService) {
this.validateForm1 = fb.group({
name1: [null, []],
name2: [null, []],
name3: [null, []]
createTime: [null, []],
modifyTime: [null, []],
});
}
@ -127,7 +122,6 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
ui: {
widget: 'text'
},
default: 0
},
externalResourceCode: {
type: 'string',
@ -163,7 +157,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
};
this.ui1 = {
'*': {
spanLabelFixed: 90,
spanLabelFixed: 120,
grid: { span: 8 }
}
};
@ -192,7 +186,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
initSF3() {
this.schema3 = {
properties: {
name1: {
goodsNameId: {
type: 'string',
title: '货物名称',
enum: [
@ -240,7 +234,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
initSF4() {
this.schema4 = {
properties: {
name3: {
weight: {
type: 'string',
title: '重量/体积',
ui: {
@ -248,7 +242,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
placeholder: '请输入'
}
},
name4: {
volume: {
type: 'string',
title: '',
ui: {
@ -256,7 +250,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
placeholder: '请输入'
}
},
name5: {
vehicleDemand: {
type: 'string',
title: '用车需求',
enum: [
@ -305,13 +299,13 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
spanLabelFixed: 90,
grid: { span: 24 }
},
$name3: {
$weight: {
grid: { span: 12 }
},
$name4: {
$volume: {
grid: { span: 12 }
},
$name5: {
$vehicleDemand: {
grid: { span: 12 }
},
$name6: {
@ -323,7 +317,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
initSF5() {
this.schema5 = {
properties: {
name1: {
goodsValue: {
type: 'string',
title: '货物价值',
ui: {
@ -344,12 +338,12 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
initSF6() {
this.schema6 = {
properties: {
name1: {
stateReceipt: {
type: 'string',
title: '是否回单',
enum: [
{ label: '1', value: '1' },
{ label: '2', value: '2' }
{ label: '', value: '1' },
{ label: '', value: '2' }
],
ui: {
widget: 'select',
@ -365,7 +359,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
// change: (i) => this.updateCategory(i, '/categoryId2'),
} as SFSelectWidgetSchema
},
name2: {
remarks: {
type: 'string',
title: '备注',
ui: {
@ -387,11 +381,11 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
initSF7() {
this.schema7 = {
properties: {
name1: { type: 'number', title: '预付', default: 0, ui: { prefix: '¥' } as SFNumberWidgetSchema },
name2: { type: 'number', title: '到付', default: 0, ui: { prefix: '¥' } as SFNumberWidgetSchema },
name3: { type: 'number', title: '油卡', default: 0, ui: { prefix: '¥' } as SFNumberWidgetSchema },
name4: { type: 'number', title: '回单付', default: 0, ui: { prefix: '¥' } as SFNumberWidgetSchema },
name5: {
prePay: { type: 'number', title: '预付', default: 0, ui: { prefix: '¥' } as SFNumberWidgetSchema },
toPay: { type: 'number', title: '到付', default: 0, ui: { prefix: '¥' } as SFNumberWidgetSchema },
oilCardPay: { type: 'number', title: '油卡', default: 0, ui: { prefix: '¥' } as SFNumberWidgetSchema },
receiptPay: { type: 'number', title: '回单付', default: 0, ui: { prefix: '¥' } as SFNumberWidgetSchema },
oilCardPay2: {
type: 'string',
title: '小计',
ui: {
@ -399,7 +393,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
placeholder: '请输入'
}
},
name6: {
appendFee: {
type: 'string',
title: '附加费',
ui: {
@ -407,7 +401,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
placeholder: '请输入'
}
},
name7: {
totalFee: {
type: 'string',
title: '总费用',
ui: {
@ -435,9 +429,9 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
addStartInfo(event: any) {
this.startInfo.push({
addresss: '',
name: '',
phone: ''
detailedAddress: '',
appUserName: '',
contractTelephone: ''
});
}
subStartInfo(event: any, index: number) {
@ -446,9 +440,9 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
addEndInfo(event: any) {
this.endInfo.push({
addresss: '',
name: '',
phone: ''
detailedAddress: '',
appUserName: '',
contractTelephone: ''
});
}
subEndInfo(event: any, index: number) {
@ -469,10 +463,21 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
this.validateForm1.controls[key].updateValueAndValidity();
});
console.log(this.validateForm1);
var d = new Date(this.validateForm1.value.createTime);
console.log(d.getFullYear() + '-' + (d.getMonth() + 1) + '-' + d.getDate() + ' ' + d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds())
if (this.validateForm1.invalid) {
return;
}
console.log(this.sf1.value)
console.log(this.startInfo)
console.log(this.endInfo)
console.log(this.validateForm1.value)
console.log(this.sf3.value)
console.log(this.sf4.value)
console.log(this.sf5.value)
console.log(this.sf6.value)
console.log(this.sf7.value)
// const data = this.form.value;
// this.http.post('/register', data).subscribe(() => {
// this.router.navigateByUrl('/passport/register-result', {
@ -497,9 +502,81 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
// 初始化信息
initdata() {
console.log(this.id)
this.service.request(`${this.service.$api_get_getCompleteVehicleDetail}`, {id:this.id}).subscribe((res) => {
// this.service.request(`${this.service.$api_get_getCompleteVehicleDetail}`, {id:this.id}).subscribe((res) => {
this.service.request(`${this.service.$api_get_getBulkDetail}`, {id:this.id}).subscribe((res) => {
console.log(res)
this.dataList = res;
// this.dataList = res;
this.sf1data = {
shipperAppUserNmae: res?.shipperAppUserNmae || '',
enterpriseProjectName: res?.enterpriseProjectName || '',
enterpriseInfoName: res?.enterpriseInfoName || '',
externalResourceCode: res?.externalResourceCode || '',
dispatchId: res?.dispatchId || '',
}
res.unLoadingPlaceList.forEach((element: any) => {
if(element.type === 1) {
this.startInfo.push({
detailedAddress: element.detailedAddress,
appUserName: element.appUserName,
contractTelephone: element.contractTelephone,
})
console.log(element)
if(element.createTime) {
this.creatTime = element.createTime
this.creatTime = element.modifyTime
}
} else if(element.type === 2) {
this.endInfo.push({
detailedAddress: element.detailedAddress,
appUserName: element.appUserName,
contractTelephone: element.contractTelephone,
})
}
});
this.sf3data = {
goodsNameId: res?.goodsInfoList.goodsNameId || '',
weight: res?.goodsInfoList.weight || '',
volume: res?.goodsInfoList.volume || '',
externalResourceCode: res?.goodsInfoList.goodsNameId || '',
}
this.sf4data = {
goodsNameId: res?.goodsInfoList.goodsNameId || '',
weight: res?.goodsInfoList.weight || '',
volume: res?.goodsInfoList.volume || '',
externalResourceCode: res?.goodsInfoList.goodsNameId || '',
}
this.sf5data = {
goodsValue: res?.goodsValue || '',
}
this.sf6data = {
stateReceipt: res?.supplementaryInformationVO.stateReceipt || '',
remarks: res?.supplementaryInformationVO.remarks || '',
}
this.sf7data = {
prePay: res?.shippingInformationVO?.prePay || '',
toPay: res?.shippingInformationVO?.toPay || '',
oilCardPay: res?.shippingInformationVO?.oilCardPay || '',
receiptPay: res?.shippingInformationVO?.receiptPay || '',
oilCardPay2: res?.shippingInformationVO?.oilCardPay || '',
appendFee: res?.shippingInformationVO?.appendFee || '',
totalFee: res?.shippingInformationVO?.totalFee || '',
name8: res?.shippingInformationVO?.appendFee || '',
}
// <p>预付:{{dataList?.shippingInformationVO?.prePay | currency: '¥' }}</p>
// <p>油卡:{{dataList?.shippingInformationVO?.oilCardPay | currency: '¥'}}</p>
// <p>到付:{{dataList?.shippingInformationVO?.toPay | currency: '¥'}}</p>
// <p>回单付:{{dataList?.shippingInformationVO?.receiptPay | currency: '¥'}}</p>
// <p>保险费:{{dataList?.shippingInformationVO?.insuranceFee | currency: '¥'}}</p>
// <p>附加费保险费:{{dataList?.shippingInformationVO?.appendFee | currency: '¥'}}</p> totalFee
console.log(this.sf1.value)
console.log(this.startInfo)
console.log(this.endInfo)
console.log(this.validateForm1.value)
console.log(this.sf3.value)
console.log(this.sf4.value)
console.log(this.sf5.value)
console.log(this.sf6.value)
})
}
}