车辆接口更新
This commit is contained in:
@ -4,7 +4,7 @@
|
|||||||
* @Author : Shiming
|
* @Author : Shiming
|
||||||
* @Date : 2021-12-24 16:58:02
|
* @Date : 2021-12-24 16:58:02
|
||||||
* @LastEditors : Shiming
|
* @LastEditors : Shiming
|
||||||
* @LastEditTime : 2022-01-20 20:22:48
|
* @LastEditTime : 2022-01-20 20:32:44
|
||||||
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.html
|
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.html
|
||||||
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||||
-->
|
-->
|
||||||
@ -70,13 +70,14 @@
|
|||||||
|
|
||||||
|
|
||||||
<nz-card>
|
<nz-card>
|
||||||
<div class="card-title" id="distannce1"
|
<div class="card-title"
|
||||||
>装卸货信息<span class="tip-font">预计公里数:{{ totalDistance }}km,预计行程耗时:{{ totalTime }}小时</span></div
|
>装卸货信息<span class="tip-font">预计公里数:{{ totalDistance }}km,预计行程耗时:{{ totalTime }}小时</span></div
|
||||||
>
|
>
|
||||||
|
|
||||||
<form nz-form [formGroup]="validateForm1" role="form">
|
<form nz-form [formGroup]="validateForm1" role="form">
|
||||||
<div nz-row [nzGutter]="24">
|
<div nz-row [nzGutter]="24">
|
||||||
<div nz-col [nzSpan]="8">
|
<div nz-col [nzSpan]="10">
|
||||||
<div *ngFor="let data of startInfo; let idx = index">
|
<div *ngFor="let data1 of startInfo; let idx = index">
|
||||||
<nz-form-item>
|
<nz-form-item>
|
||||||
<nz-form-label [nzSpan]="4" nzRequired>装货地</nz-form-label>
|
<nz-form-label [nzSpan]="4" nzRequired>装货地</nz-form-label>
|
||||||
<nz-form-control [nzErrorTip]="'请输入装货地'">
|
<nz-form-control [nzErrorTip]="'请输入装货地'">
|
||||||
@ -84,36 +85,50 @@
|
|||||||
<nz-input-group [nzSuffix]="endInconTemp1">
|
<nz-input-group [nzSuffix]="endInconTemp1">
|
||||||
<input
|
<input
|
||||||
nz-input
|
nz-input
|
||||||
[(ngModel)]="data.detailedAddress"
|
[(ngModel)]="data1.detailedAddress"
|
||||||
(click)="openMap('start', idx)"
|
(click)="openMap('start', idx)"
|
||||||
formControlName="loadAddress{{ idx }}"
|
formControlName="loadAddress{{ idx }}"
|
||||||
placeholder="请输入装货地"
|
placeholder="请输入装货地"
|
||||||
/>
|
/>
|
||||||
</nz-input-group>
|
</nz-input-group>
|
||||||
<span style="padding: 0 10px"
|
|
||||||
><i nz-icon nzType="menu" nzTheme="outline" style="color: #1890ff" (click)="openMap('start', idx)"></i
|
|
||||||
></span>
|
|
||||||
</div>
|
</div>
|
||||||
</nz-form-control>
|
</nz-form-control>
|
||||||
</nz-form-item>
|
</nz-form-item>
|
||||||
<nz-form-item>
|
<nz-form-item>
|
||||||
<nz-form-label [nzSpan]="4" nzRequired>联系人</nz-form-label>
|
<nz-form-label [nzSpan]="4" nzRequired>联系人</nz-form-label>
|
||||||
<nz-form-control [nzErrorTip]="'请输入联系人信息'">
|
<div style="display: flex;">
|
||||||
<div class="align-center">
|
<nz-form-control [nzErrorTip]="'请输入联系人姓名'">
|
||||||
<input nz-input [(ngModel)]="data.appUserName" [ngModelOptions]="{ standalone: true }" maxlength="30" />
|
<input
|
||||||
<input style="margin-left: 12px" nz-input [(ngModel)]="data.contractTelephone" [ngModelOptions]="{ standalone: true }" maxlength="11" />
|
nz-input
|
||||||
</div>
|
[(ngModel)]="data1.appUserName"
|
||||||
</nz-form-control>
|
formControlName="loadName{{ idx }}"
|
||||||
|
name="loadName{{ idx }}"
|
||||||
|
maxlength="30"
|
||||||
|
placeholder="请输入联系人姓名"
|
||||||
|
/>
|
||||||
|
</nz-form-control>
|
||||||
|
<nz-form-control [nzErrorTip]="'请输入联系人电话'">
|
||||||
|
<input
|
||||||
|
style="margin-left: 12px"
|
||||||
|
nz-input
|
||||||
|
[(ngModel)]="data1.contractTelephone"
|
||||||
|
maxlength="11"
|
||||||
|
formControlName="loadPhone{{ idx }}"
|
||||||
|
name="loadPhone{{ idx }}"
|
||||||
|
placeholder="请输入联系人电话"
|
||||||
|
/>
|
||||||
|
</nz-form-control>
|
||||||
|
</div>
|
||||||
</nz-form-item>
|
</nz-form-item>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div nz-col [nzSpan]="8">
|
<div nz-col [nzSpan]="4">
|
||||||
<div style="display: flex; justify-content: center">
|
<div style="display: flex; justify-content: center">
|
||||||
<span style="padding: 24 px; font-size: 30px; color: #7d7d7d"><i nz-icon nzType="swap" nzTheme="outline"></i></span>
|
<span style="padding: 24 px; font-size: 30px; color: #7d7d7d"><i nz-icon nzType="swap" nzTheme="outline"></i></span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div nz-col [nzSpan]="8">
|
<div nz-col [nzSpan]="10">
|
||||||
<div *ngFor="let data of endInfo; let idx = index">
|
<div *ngFor="let data2 of endInfo; let idx = index">
|
||||||
<nz-form-item>
|
<nz-form-item>
|
||||||
<nz-form-label [nzSpan]="4" nzRequired>卸货地</nz-form-label>
|
<nz-form-label [nzSpan]="4" nzRequired>卸货地</nz-form-label>
|
||||||
<nz-form-control [nzErrorTip]="'请输入卸货地'">
|
<nz-form-control [nzErrorTip]="'请输入卸货地'">
|
||||||
@ -121,37 +136,65 @@
|
|||||||
<nz-input-group [nzSuffix]="endInconTemp1">
|
<nz-input-group [nzSuffix]="endInconTemp1">
|
||||||
<input
|
<input
|
||||||
nz-input
|
nz-input
|
||||||
[(ngModel)]="data.detailedAddress"
|
[(ngModel)]="data2.detailedAddress"
|
||||||
(click)="openMap('end', idx)"
|
(click)="openMap('end', idx)"
|
||||||
formControlName="unloadAddress{{ idx }}"
|
formControlName="unloadAddress{{ idx }}"
|
||||||
placeholder="请输入卸货地"
|
placeholder="请输入卸货地"
|
||||||
|
name="unloadAddress{{ idx }}"
|
||||||
/>
|
/>
|
||||||
</nz-input-group>
|
</nz-input-group>
|
||||||
<span style="padding: 0 10px"><i nz-icon nzType="menu" nzTheme="outline" style="color: #1890ff"></i></span>
|
|
||||||
</div>
|
</div>
|
||||||
</nz-form-control>
|
</nz-form-control>
|
||||||
</nz-form-item>
|
</nz-form-item>
|
||||||
<nz-form-item>
|
<nz-form-item>
|
||||||
<nz-form-label [nzSpan]="4" nzRequired>联系人</nz-form-label>
|
<nz-form-label [nzSpan]="4" nzRequired>联系人</nz-form-label>
|
||||||
<nz-form-control [nzErrorTip]="'请输入联系人信息'">
|
<div style="display: flex;">
|
||||||
<div class="align-center">
|
<nz-form-control [nzErrorTip]="'请输入联系人姓名'">
|
||||||
<input nz-input [(ngModel)]="data.appUserName" [ngModelOptions]="{ standalone: true }" maxlength="30" />
|
<input
|
||||||
<input style="margin-left: 12px" nz-input [(ngModel)]="data.contractTelephone" [ngModelOptions]="{ standalone: true }" maxlength="11" />
|
nz-input
|
||||||
</div>
|
[(ngModel)]="data2.appUserName"
|
||||||
</nz-form-control>
|
maxlength="30"
|
||||||
|
formControlName="unloadName{{ idx }}"
|
||||||
|
name="unloadAddress{{ idx }}"
|
||||||
|
placeholder="请输入联系人姓名"
|
||||||
|
/>
|
||||||
|
</nz-form-control>
|
||||||
|
<nz-form-control [nzErrorTip]="'请输入联系人电话'">
|
||||||
|
<input
|
||||||
|
style="margin-left: 12px"
|
||||||
|
nz-input
|
||||||
|
[(ngModel)]="data2.contractTelephone"
|
||||||
|
formControlName="unloadPhone{{ idx }}"
|
||||||
|
name="unloadAddress{{ idx }}"
|
||||||
|
maxlength="11"
|
||||||
|
placeholder="请输入联系人电话"
|
||||||
|
/>
|
||||||
|
</nz-form-control>
|
||||||
|
</div>
|
||||||
</nz-form-item>
|
</nz-form-item>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div nz-row [nzGutter]="24" style="margin-top: 24px">
|
<div nz-row [nzGutter]="24" style="margin-top: 24px">
|
||||||
<div nz-col [nzSpan]="9">
|
<div nz-col [nzSpan]="10">
|
||||||
<p class="time-info">计划装货时间:{{i?.loadPlanTime}}</p>
|
<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="loadingTime" name="loadingTime"></nz-date-picker>
|
||||||
|
</nz-form-control>
|
||||||
|
</nz-form-item>
|
||||||
</div>
|
</div>
|
||||||
<div nz-col [nzSpan]="8">
|
<div nz-col [nzSpan]="4"></div>
|
||||||
<p class="time-info">计划卸货时间:{{i?.unloadPlanTime}}</p>
|
<div nz-col [nzSpan]="10">
|
||||||
|
<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="unloadingTime" name="unloadingTime"></nz-date-picker>
|
||||||
|
</nz-form-control>
|
||||||
|
</nz-form-item>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<ng-template #endInconTemp1><i nz-icon nzType="global"></i></ng-template>
|
<ng-template #endInconTemp1><i nz-icon nzType="environment" nzTheme="outline"></i></ng-template>
|
||||||
</form>
|
</form>
|
||||||
</nz-card>
|
</nz-card>
|
||||||
<nz-card nzTitle="基本信息" #distannce2>
|
<nz-card nzTitle="基本信息" #distannce2>
|
||||||
|
|||||||
@ -1,86 +1,33 @@
|
|||||||
:host {
|
:host {
|
||||||
.btn-size {
|
|
||||||
font-size: 14px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.bdr {
|
|
||||||
border-right: 1px solid #ccc;
|
|
||||||
}
|
|
||||||
|
|
||||||
.bdl {
|
|
||||||
border-left: 1px solid #ccc;
|
|
||||||
}
|
|
||||||
|
|
||||||
.source-info {
|
|
||||||
p {
|
|
||||||
margin-bottom: .5em;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.freight-info-box {
|
|
||||||
width: 95%;
|
|
||||||
}
|
|
||||||
|
|
||||||
.freigth-label {
|
|
||||||
display : inline-block;
|
|
||||||
width : 50px;
|
|
||||||
text-align: right;
|
|
||||||
}
|
|
||||||
|
|
||||||
::ng-deep {
|
|
||||||
.approval-status {
|
|
||||||
.ant-steps {
|
|
||||||
width : 70%;
|
|
||||||
margin: 0 auto;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.ant-tabs-top>.ant-tabs-nav,
|
|
||||||
.ant-tabs-bottom>.ant-tabs-nav,
|
|
||||||
.ant-tabs-top>div>.ant-tabs-nav,
|
|
||||||
.ant-tabs-bottom>div>.ant-tabs-nav {
|
|
||||||
margin: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.ant-anchor-ink::before {
|
|
||||||
width: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.ant-tabs-card.ant-tabs-top>.ant-tabs-nav .ant-tabs-tab+.ant-tabs-tab,
|
|
||||||
.ant-tabs-card.ant-tabs-bottom>.ant-tabs-nav .ant-tabs-tab+.ant-tabs-tab,
|
|
||||||
.ant-tabs-card.ant-tabs-top>div>.ant-tabs-nav .ant-tabs-tab+.ant-tabs-tab,
|
|
||||||
.ant-tabs-card.ant-tabs-bottom>div>.ant-tabs-nav .ant-tabs-tab+.ant-tabs-tab {
|
|
||||||
margin-left: 40px
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.leftPadding {
|
|
||||||
padding-right: 100px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.tip-font {
|
.tip-font {
|
||||||
margin-left: 16px;
|
margin-left: 16px;
|
||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
font-size : 12px;
|
font-size: 12px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.card-title {
|
.card-title {
|
||||||
margin-bottom: 24px;
|
margin-bottom: 24px;
|
||||||
font-weight : bold;
|
font-weight: bold;
|
||||||
font-size : 16px;
|
font-size: 16px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.align-center {
|
.align-center {
|
||||||
display : flex;
|
display: flex;
|
||||||
align-items : center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
}
|
}
|
||||||
|
.align-center2 {
|
||||||
#container {
|
display: flex;
|
||||||
width : 300px;
|
align-items: center;
|
||||||
|
}
|
||||||
|
#container {
|
||||||
|
width: 300px;
|
||||||
height: 180px;
|
height: 180px;
|
||||||
}
|
}
|
||||||
.ant-col-10 {
|
:host {
|
||||||
flex: none;
|
::ng-deep {
|
||||||
}
|
nz-input-number{width: 100%;}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@ -4,7 +4,7 @@
|
|||||||
* @Author : Shiming
|
* @Author : Shiming
|
||||||
* @Date : 2021-12-24 16:58:02
|
* @Date : 2021-12-24 16:58:02
|
||||||
* @LastEditors : Shiming
|
* @LastEditors : Shiming
|
||||||
* @LastEditTime : 2022-01-20 20:21:35
|
* @LastEditTime : 2022-01-20 20:34:50
|
||||||
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.ts
|
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.ts
|
||||||
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||||
*/
|
*/
|
||||||
@ -507,46 +507,45 @@ loadTime: any; // 货源单设置回显
|
|||||||
}
|
}
|
||||||
// -------------------装卸货信息处理
|
// -------------------装卸货信息处理
|
||||||
// 打开地图
|
// 打开地图
|
||||||
openMap(type: string, index: number) {
|
// 打开地图
|
||||||
const modalRef = this.modalService.create({
|
openMap(type: string, index: number) {
|
||||||
nzTitle: '',
|
const modalRef = this.modalService.create({
|
||||||
nzContent: AmapPoiPickerComponent,
|
nzTitle: '',
|
||||||
nzWidth: 900,
|
nzContent: AmapPoiPickerComponent,
|
||||||
nzOnOk: item => {
|
nzWidth: 900,
|
||||||
const poi = item.poi;
|
nzOnOk: item => {
|
||||||
const locList = poi.pois;
|
const poi = item.poi;
|
||||||
switch (type) {
|
const locList = poi.pois;
|
||||||
case 'start':
|
switch (type) {
|
||||||
this.startInfo[index].detailedAddress = poi.formattedAddress;
|
case 'start':
|
||||||
this.startInfo[index].longitude = locList[0];
|
this.startInfo[index].detailedAddress = poi.formattedAddress;
|
||||||
this.startInfo[index].latitude = locList[1];
|
this.startInfo[index].longitude = locList[0];
|
||||||
this.startInfo[index].province = poi.addressComponent.province;
|
this.startInfo[index].latitude = locList[1];
|
||||||
this.startInfo[index].city = poi.addressComponent.city;
|
this.startInfo[index].province = poi.addressComponent.province;
|
||||||
this.startInfo[index].area = poi.addressComponent.district;
|
this.startInfo[index].city = poi.addressComponent.city;
|
||||||
this.startInfo[index].address = poi.formattedAddress;
|
this.startInfo[index].area = poi.addressComponent.district;
|
||||||
break;
|
break;
|
||||||
case 'end':
|
case 'end':
|
||||||
this.endInfo[index].detailedAddress = poi.formattedAddress;
|
this.endInfo[index].detailedAddress = poi.formattedAddress;
|
||||||
this.endInfo[index].longitude = locList[0];
|
this.endInfo[index].longitude = locList[0];
|
||||||
this.endInfo[index].latitude = locList[1];
|
this.endInfo[index].latitude = locList[1];
|
||||||
this.endInfo[index].province = poi.addressComponent.province;
|
this.endInfo[index].province = poi.addressComponent.province;
|
||||||
this.endInfo[index].city = poi.addressComponent.city;
|
this.endInfo[index].city = poi.addressComponent.city;
|
||||||
this.endInfo[index].area = poi.addressComponent.district;
|
this.endInfo[index].area = poi.addressComponent.district;
|
||||||
this.endInfo[index].address = poi.formattedAddress;
|
break;
|
||||||
break;
|
default:
|
||||||
default:
|
break;
|
||||||
break;
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if (this.startInfo[0]?.area && this.endInfo[0]?.area) {
|
if (this.startInfo[0]?.area && this.endInfo[0]?.area) {
|
||||||
this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe((res: any) => {
|
this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => {
|
||||||
this.totalDistance = res.distance;
|
this.totalDistance = res.distance;
|
||||||
this.totalTime = res.time;
|
this.totalTime = res.time;
|
||||||
});
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
});
|
||||||
});
|
}
|
||||||
}
|
|
||||||
|
|
||||||
initSF3() {
|
initSF3() {
|
||||||
this.schema3 = {
|
this.schema3 = {
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
* @Author : Shiming
|
* @Author : Shiming
|
||||||
* @Date : 2021-12-23 13:39:58
|
* @Date : 2021-12-23 13:39:58
|
||||||
* @LastEditors : Shiming
|
* @LastEditors : Shiming
|
||||||
* @LastEditTime : 2022-01-20 20:23:52
|
* @LastEditTime : 2022-01-20 20:28:15
|
||||||
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail-change\\vehicle-detail-change.component.html
|
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail-change\\vehicle-detail-change.component.html
|
||||||
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||||
-->
|
-->
|
||||||
@ -65,8 +65,8 @@
|
|||||||
>
|
>
|
||||||
<form nz-form [formGroup]="validateForm1" role="form">
|
<form nz-form [formGroup]="validateForm1" role="form">
|
||||||
<div nz-row [nzGutter]="24">
|
<div nz-row [nzGutter]="24">
|
||||||
<div nz-col [nzSpan]="8">
|
<div nz-col [nzSpan]="10">
|
||||||
<div *ngFor="let data of startInfo; let idx = index">
|
<div *ngFor="let data1 of startInfo; let idx = index">
|
||||||
<nz-form-item>
|
<nz-form-item>
|
||||||
<nz-form-label [nzSpan]="4" nzRequired>装货地</nz-form-label>
|
<nz-form-label [nzSpan]="4" nzRequired>装货地</nz-form-label>
|
||||||
<nz-form-control [nzErrorTip]="'请输入装货地'">
|
<nz-form-control [nzErrorTip]="'请输入装货地'">
|
||||||
@ -74,42 +74,51 @@
|
|||||||
<nz-input-group [nzSuffix]="endInconTemp1">
|
<nz-input-group [nzSuffix]="endInconTemp1">
|
||||||
<input
|
<input
|
||||||
nz-input
|
nz-input
|
||||||
[(ngModel)]="data.detailedAddress"
|
[(ngModel)]="data1.detailedAddress"
|
||||||
(click)="openMap('start', idx)"
|
(click)="openMap('start', idx)"
|
||||||
formControlName="loadAddress{{ idx }}"
|
formControlName="loadAddress{{ idx }}"
|
||||||
placeholder="请输入装货地"
|
placeholder="请输入装货地"
|
||||||
/>
|
/>
|
||||||
</nz-input-group>
|
</nz-input-group>
|
||||||
<span style="padding: 0 10px"
|
<!-- <span style="padding: 0 10px"
|
||||||
><i nz-icon nzType="menu" nzTheme="outline" style="color: #1890ff" (click)="openMap('start', idx)"></i
|
><i nz-icon nzType="menu" nzTheme="outline" style="color: #1890ff" (click)="chooseAddress(idx, 'start')"></i
|
||||||
></span>
|
></span> -->
|
||||||
</div>
|
</div>
|
||||||
</nz-form-control>
|
</nz-form-control>
|
||||||
</nz-form-item>
|
</nz-form-item>
|
||||||
<nz-form-item>
|
<nz-form-item>
|
||||||
<nz-form-label [nzSpan]="4" nzRequired>联系人</nz-form-label>
|
<nz-form-label [nzSpan]="4" nzRequired>联系人</nz-form-label>
|
||||||
<nz-form-control [nzErrorTip]="'请输入联系人信息'">
|
<div style="display: flex;">
|
||||||
<div class="align-center">
|
<nz-form-control [nzErrorTip]="'请输入联系人姓名'">
|
||||||
<input nz-input [(ngModel)]="data.appUserName" [ngModelOptions]="{ standalone: true }" maxlength="30" />
|
<input
|
||||||
|
nz-input
|
||||||
|
[(ngModel)]="data1.appUserName"
|
||||||
|
formControlName="loadName{{ idx }}"
|
||||||
|
maxlength="30"
|
||||||
|
placeholder="请输入联系人姓名"
|
||||||
|
/>
|
||||||
|
</nz-form-control>
|
||||||
|
<nz-form-control [nzErrorTip]="'请输入联系人电话'">
|
||||||
<input
|
<input
|
||||||
style="margin-left: 12px"
|
style="margin-left: 12px"
|
||||||
nz-input
|
nz-input
|
||||||
[(ngModel)]="data.contractTelephone"
|
[(ngModel)]="data1.contractTelephone"
|
||||||
[ngModelOptions]="{ standalone: true }"
|
|
||||||
maxlength="11"
|
maxlength="11"
|
||||||
|
formControlName="loadPhone{{ idx }}"
|
||||||
|
placeholder="请输入联系人电话"
|
||||||
/>
|
/>
|
||||||
</div>
|
</nz-form-control>
|
||||||
</nz-form-control>
|
</div>
|
||||||
</nz-form-item>
|
</nz-form-item>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div nz-col [nzSpan]="8">
|
<div nz-col [nzSpan]="4">
|
||||||
<div style="display: flex; justify-content: center">
|
<div style="display: flex; justify-content: center">
|
||||||
<span style="padding: 24 px; font-size: 30px; color: #7d7d7d"><i nz-icon nzType="swap" nzTheme="outline"></i></span>
|
<span style="padding: 24 px; font-size: 30px; color: #7d7d7d"><i nz-icon nzType="swap" nzTheme="outline"></i></span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div nz-col [nzSpan]="8">
|
<div nz-col [nzSpan]="10">
|
||||||
<div *ngFor="let data of endInfo; let idx = index">
|
<div *ngFor="let data2 of endInfo; let idx = index">
|
||||||
<nz-form-item>
|
<nz-form-item>
|
||||||
<nz-form-label [nzSpan]="4" nzRequired>卸货地</nz-form-label>
|
<nz-form-label [nzSpan]="4" nzRequired>卸货地</nz-form-label>
|
||||||
<nz-form-control [nzErrorTip]="'请输入卸货地'">
|
<nz-form-control [nzErrorTip]="'请输入卸货地'">
|
||||||
@ -117,43 +126,46 @@
|
|||||||
<nz-input-group [nzSuffix]="endInconTemp1">
|
<nz-input-group [nzSuffix]="endInconTemp1">
|
||||||
<input
|
<input
|
||||||
nz-input
|
nz-input
|
||||||
[(ngModel)]="data.detailedAddress"
|
[(ngModel)]="data2.detailedAddress"
|
||||||
(click)="openMap('end', idx)"
|
(click)="openMap('end', idx)"
|
||||||
formControlName="unloadAddress{{ idx }}"
|
formControlName="unloadAddress{{ idx }}"
|
||||||
placeholder="请输入卸货地"
|
placeholder="请输入卸货地"
|
||||||
/>
|
/>
|
||||||
</nz-input-group>
|
</nz-input-group>
|
||||||
<span style="padding: 0 10px"><i nz-icon nzType="menu" nzTheme="outline" style="color: #1890ff"></i></span>
|
<!-- <span style="padding: 0 10px"
|
||||||
|
><i nz-icon nzType="menu" nzTheme="outline" style="color: #1890ff" (click)="chooseAddress(idx, 'end')"></i
|
||||||
|
></span> -->
|
||||||
</div>
|
</div>
|
||||||
</nz-form-control>
|
</nz-form-control>
|
||||||
</nz-form-item>
|
</nz-form-item>
|
||||||
<nz-form-item>
|
<nz-form-item>
|
||||||
<nz-form-label [nzSpan]="4" nzRequired>联系人</nz-form-label>
|
<nz-form-label [nzSpan]="4" nzRequired>联系人</nz-form-label>
|
||||||
<nz-form-control [nzErrorTip]="'请输入联系人信息'">
|
<div style="display: flex;">
|
||||||
<div class="align-center">
|
<nz-form-control [nzErrorTip]="'请输入联系人姓名'">
|
||||||
<input nz-input [(ngModel)]="data.appUserName" [ngModelOptions]="{ standalone: true }" maxlength="30" />
|
<input
|
||||||
|
nz-input
|
||||||
|
[(ngModel)]="data2.appUserName"
|
||||||
|
maxlength="30"
|
||||||
|
formControlName="unloadName{{ idx }}"
|
||||||
|
placeholder="请输入联系人姓名"
|
||||||
|
/>
|
||||||
|
</nz-form-control>
|
||||||
|
<nz-form-control [nzErrorTip]="'请输入联系人电话'">
|
||||||
<input
|
<input
|
||||||
style="margin-left: 12px"
|
style="margin-left: 12px"
|
||||||
nz-input
|
nz-input
|
||||||
[(ngModel)]="data.contractTelephone"
|
[(ngModel)]="data2.contractTelephone"
|
||||||
[ngModelOptions]="{ standalone: true }"
|
formControlName="unloadPhone{{ idx }}"
|
||||||
maxlength="11"
|
maxlength="11"
|
||||||
|
placeholder="请输入联系人电话"
|
||||||
/>
|
/>
|
||||||
</div>
|
</nz-form-control>
|
||||||
</nz-form-control>
|
</div>
|
||||||
</nz-form-item>
|
</nz-form-item>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div nz-row [nzGutter]="24" style="margin-top: 24px">
|
<ng-template #endInconTemp1><i nz-icon nzType="environment" nzTheme="outline"></i></ng-template>
|
||||||
<div nz-col [nzSpan]="9">
|
|
||||||
<p class="time-info">计划装货时间:{{ i?.loadPlanTime }}</p>
|
|
||||||
</div>
|
|
||||||
<div nz-col [nzSpan]="8">
|
|
||||||
<p class="time-info">计划卸货时间:{{ i?.unloadPlanTime }}</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<ng-template #endInconTemp1><i nz-icon nzType="global"></i></ng-template>
|
|
||||||
</form>
|
</form>
|
||||||
</nz-card>
|
</nz-card>
|
||||||
<nz-card nzTitle="基本信息" configuration #distannce2>
|
<nz-card nzTitle="基本信息" configuration #distannce2>
|
||||||
|
|||||||
@ -1,86 +1,33 @@
|
|||||||
:host {
|
:host {
|
||||||
.btn-size {
|
|
||||||
font-size: 14px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.bdr {
|
|
||||||
border-right: 1px solid #ccc;
|
|
||||||
}
|
|
||||||
|
|
||||||
.bdl {
|
|
||||||
border-left: 1px solid #ccc;
|
|
||||||
}
|
|
||||||
|
|
||||||
.source-info {
|
|
||||||
p {
|
|
||||||
margin-bottom: .5em;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.freight-info-box {
|
|
||||||
width: 95%;
|
|
||||||
}
|
|
||||||
|
|
||||||
.freigth-label {
|
|
||||||
display : inline-block;
|
|
||||||
width : 50px;
|
|
||||||
text-align: right;
|
|
||||||
}
|
|
||||||
|
|
||||||
::ng-deep {
|
|
||||||
.approval-status {
|
|
||||||
.ant-steps {
|
|
||||||
width : 70%;
|
|
||||||
margin: 0 auto;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.ant-tabs-top>.ant-tabs-nav,
|
|
||||||
.ant-tabs-bottom>.ant-tabs-nav,
|
|
||||||
.ant-tabs-top>div>.ant-tabs-nav,
|
|
||||||
.ant-tabs-bottom>div>.ant-tabs-nav {
|
|
||||||
margin: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.ant-anchor-ink::before {
|
|
||||||
width: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.ant-tabs-card.ant-tabs-top>.ant-tabs-nav .ant-tabs-tab+.ant-tabs-tab,
|
|
||||||
.ant-tabs-card.ant-tabs-bottom>.ant-tabs-nav .ant-tabs-tab+.ant-tabs-tab,
|
|
||||||
.ant-tabs-card.ant-tabs-top>div>.ant-tabs-nav .ant-tabs-tab+.ant-tabs-tab,
|
|
||||||
.ant-tabs-card.ant-tabs-bottom>div>.ant-tabs-nav .ant-tabs-tab+.ant-tabs-tab {
|
|
||||||
margin-left: 40px
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.leftPadding {
|
|
||||||
padding-right: 100px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.tip-font {
|
.tip-font {
|
||||||
margin-left: 16px;
|
margin-left: 16px;
|
||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
font-size : 12px;
|
font-size: 12px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.card-title {
|
.card-title {
|
||||||
margin-bottom: 24px;
|
margin-bottom: 24px;
|
||||||
font-weight : bold;
|
font-weight: bold;
|
||||||
font-size : 16px;
|
font-size: 16px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.align-center {
|
.align-center {
|
||||||
display : flex;
|
display: flex;
|
||||||
align-items : center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
}
|
}
|
||||||
|
.align-center2 {
|
||||||
#container {
|
display: flex;
|
||||||
width : 300px;
|
align-items: center;
|
||||||
|
}
|
||||||
|
#container {
|
||||||
|
width: 300px;
|
||||||
height: 180px;
|
height: 180px;
|
||||||
}
|
}
|
||||||
.ant-col-10 {
|
:host {
|
||||||
flex: none;
|
::ng-deep {
|
||||||
}
|
nz-input-number{width: 100%;}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@ -4,7 +4,7 @@
|
|||||||
* @Author : Shiming
|
* @Author : Shiming
|
||||||
* @Date : 2021-12-23 13:39:58
|
* @Date : 2021-12-23 13:39:58
|
||||||
* @LastEditors : Shiming
|
* @LastEditors : Shiming
|
||||||
* @LastEditTime : 2022-01-20 20:11:43
|
* @LastEditTime : 2022-01-20 20:28:33
|
||||||
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail-change\\vehicle-detail-change.component.ts
|
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail-change\\vehicle-detail-change.component.ts
|
||||||
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||||
*/
|
*/
|
||||||
@ -552,25 +552,25 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
|
|||||||
nzWidth: 900,
|
nzWidth: 900,
|
||||||
nzOnOk: item => {
|
nzOnOk: item => {
|
||||||
const poi = item.poi;
|
const poi = item.poi;
|
||||||
const locList = poi.pois;
|
const locList = poi.location.toString().split(',');
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case 'start':
|
case 'start':
|
||||||
this.startInfo[index].detailedAddress = poi.formattedAddress;
|
this.startInfo[index].detailedAddress = poi.district + poi.name;
|
||||||
this.startInfo[index].longitude = locList[0];
|
this.startInfo[index].longitude = locList[0];
|
||||||
this.startInfo[index].latitude = locList[1];
|
this.startInfo[index].latitude = locList[1];
|
||||||
this.startInfo[index].province = poi.addressComponent.province;
|
this.startInfo[index].province = poi.cityInfo.province;
|
||||||
this.startInfo[index].city = poi.addressComponent.city;
|
this.startInfo[index].city = poi.cityInfo.city;
|
||||||
this.startInfo[index].area = poi.addressComponent.district;
|
this.startInfo[index].area = poi.cityInfo.district;
|
||||||
this.startInfo[index].address = poi.formattedAddress;
|
this.startInfo[index].address = poi.name;
|
||||||
break;
|
break;
|
||||||
case 'end':
|
case 'end':
|
||||||
this.endInfo[index].detailedAddress = poi.formattedAddress;
|
this.endInfo[index].detailedAddress = poi.district + poi.name;
|
||||||
this.endInfo[index].longitude = locList[0];
|
this.endInfo[index].longitude = locList[0];
|
||||||
this.endInfo[index].latitude = locList[1];
|
this.endInfo[index].latitude = locList[1];
|
||||||
this.endInfo[index].province = poi.addressComponent.province;
|
this.endInfo[index].province = poi.cityInfo.province;
|
||||||
this.endInfo[index].city = poi.addressComponent.city;
|
this.endInfo[index].city = poi.cityInfo.city;
|
||||||
this.endInfo[index].area = poi.addressComponent.district;
|
this.endInfo[index].area = poi.cityInfo.district;
|
||||||
this.endInfo[index].address = poi.formattedAddress;
|
this.endInfo[index].address = poi.name;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
|||||||
Reference in New Issue
Block a user