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

Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

Browse Source
This commit is contained in:
Taric Xin
2022-02-16 15:31:42 +08:00
parent a42498eb2b ce48326072
commit 36393ca86e
14 changed files with 331 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/routes/passport/components/retrieve-password/retrieve-password.component.html
View File

@ -20,7 +20,7 @@
</nz-form-item> </nz-form-item>
<nz-form-item> <nz-form-item>
<nz-form-label nzSpan="6" nzRequired nzFor="smsVerifyCode">验证码</nz-form-label> <nz-form-label nzSpan="6" nzRequired nzFor="smsVerifyCode">验证码</nz-form-label>
<nz-form-control nzSpan="18"> <nz-form-control nzSpan="18" nzErrorTip="请输入6位验证码">
<nz-input-group [nzSuffix]="suffixTemplateInfo" nzSize="large"> <nz-input-group [nzSuffix]="suffixTemplateInfo" nzSize="large">
<input type="text" nz-input formControlName="smsVerifyCode" maxlength="6" placeholder="请输入验证码" /> <input type="text" nz-input formControlName="smsVerifyCode" maxlength="6" placeholder="请输入验证码" />
</nz-input-group> </nz-input-group>
@ -45,7 +45,7 @@
<form nz-form [formGroup]="formGroup2" class="myForm"> <form nz-form [formGroup]="formGroup2" class="myForm">
<nz-form-item> <nz-form-item>
<nz-form-label nzSpan="4" nzRequired nzFor="passWord">设置新密码</nz-form-label> <nz-form-label nzSpan="4" nzRequired nzFor="passWord">设置新密码</nz-form-label>
<nz-form-control nzSpan="8"> <nz-form-control nzSpan="8" nzErrorTip="请输入新密码">
<nz-input-group [nzSuffix]="passWordType" nzSize="large"> <nz-input-group [nzSuffix]="passWordType" nzSize="large">
<input nz-input [type]="isPassWordHide?'password':'text'" formControlName="passWord" <input nz-input [type]="isPassWordHide?'password':'text'" formControlName="passWord"
(ngModelChange)="validateConfirmPassword()" placeholder="请输入新密码" /> (ngModelChange)="validateConfirmPassword()" placeholder="请输入新密码" />
@ -53,10 +53,6 @@
<ng-template #passWordType> <ng-template #passWordType>
<i nz-icon [nzType]="isPassWordHide?'eye-invisible':'eye'" (click)="isPassWordHide=!isPassWordHide" <i nz-icon [nzType]="isPassWordHide?'eye-invisible':'eye'" (click)="isPassWordHide=!isPassWordHide"
nzTheme="outline" style="color: #bdb7b7;font-size: 18px;cursor: pointer;"></i> nzTheme="outline" style="color: #bdb7b7;font-size: 18px;cursor: pointer;"></i>
<!-- <ng-container *ngIf="control.hasError('required')"> 请输入确认密码! </ng-container>
<ng-container *ngIf="control.hasError('minLength') || control.hasError('pattern')">
8-16个字符，支持字母、数字、符号“_”和“-”，必须包含字母和数字!
</ng-container> -->
</ng-template> </ng-template>
</nz-form-control> </nz-form-control>
<div class="input-tootip"> <div class="input-tootip">
@ -71,7 +67,7 @@
</nz-form-item> </nz-form-item>
<nz-form-item> <nz-form-item>
<nz-form-label nzSpan="4" nzRequired nzFor="passWordTo">重复新密码</nz-form-label> <nz-form-label nzSpan="4" nzRequired nzFor="passWordTo">重复新密码</nz-form-label>
<nz-form-control nzSpan="8" nzDisableAutoTips> <nz-form-control nzSpan="8" nzDisableAutoTips nzErrorTip="请输入新密码">
<nz-input-group [nzSuffix]="confirmPassWordType" nzSize="large"> <nz-input-group [nzSuffix]="confirmPassWordType" nzSize="large">
<input nz-input [type]="isConfirmPassWordHide?'password':'text'" formControlName="passWordTo" <input nz-input [type]="isConfirmPassWordHide?'password':'text'" formControlName="passWordTo"
placeholder="再次输入密码" /> placeholder="再次输入密码" />

2
src/app/routes/passport/components/retrieve-password/retrieve-password.component.ts
View File

@ -163,6 +163,8 @@ export class UserRetrievePasswordComponent implements OnInit, AfterViewInit {
} else { } else {
this.service.msgSrv.error('获取验证码失败!'); this.service.msgSrv.error('获取验证码失败!');
} }
} else {
this.service.msgSrv.error(res.msg);
} }
}); });
} }

38
src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html
View File

@ -20,7 +20,7 @@
<div nz-col [nzSpan]="10"> <div nz-col [nzSpan]="10">
<div *ngFor="let data1 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]="3" nzRequired>装货地</nz-form-label>
<nz-form-control [nzErrorTip]="'请输入装货地'"> <nz-form-control [nzErrorTip]="'请输入装货地'">
<div class="align-center"> <div class="align-center">
<nz-input-group [nzSuffix]="endInconTemp1"> <nz-input-group [nzSuffix]="endInconTemp1">
@ -32,15 +32,12 @@
placeholder="请输入装货地" placeholder="请输入装货地"
/> />
</nz-input-group> </nz-input-group>
<!-- <span style="padding: 0 10px"
><i nz-icon nzType="menu" nzTheme="outline" style="color: #1890ff" (click)="chooseAddress(idx, 'start')"></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]="3" nzRequired>联系人</nz-form-label>
<div style="display: flex"> <div style="display: flex ;width: 86%">
<nz-form-control [nzErrorTip]="'请输入联系人姓名'"> <nz-form-control [nzErrorTip]="'请输入联系人姓名'">
<input <input
nz-input nz-input
@ -66,13 +63,14 @@
</div> </div>
<div nz-col [nzSpan]="4"> <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 class="swap-icon" (click)="swapAddress()"><i nz-icon nzType="swap"
nzTheme="outline"></i></span>
</div> </div>
</div> </div>
<div nz-col [nzSpan]="10"> <div nz-col [nzSpan]="10">
<div *ngFor="let data2 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]="3" nzRequired>卸货地</nz-form-label>
<nz-form-control [nzErrorTip]="'请输入卸货地'"> <nz-form-control [nzErrorTip]="'请输入卸货地'">
<div class="align-center"> <div class="align-center">
<nz-input-group [nzSuffix]="endInconTemp1"> <nz-input-group [nzSuffix]="endInconTemp1">
@ -84,15 +82,12 @@
placeholder="请输入卸货地" placeholder="请输入卸货地"
/> />
</nz-input-group> </nz-input-group>
<!-- <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]="3" nzRequired>联系人</nz-form-label>
<div style="display: flex"> <div style="display: flex;width: 86%">
<nz-form-control [nzErrorTip]="'请输入联系人姓名'"> <nz-form-control [nzErrorTip]="'请输入联系人姓名'">
<input <input
nz-input nz-input
@ -201,19 +196,10 @@
<div nz-row> <div nz-row>
<div nz-col nzSpan="12"> <div nz-col nzSpan="12">
<sf #sf7 [schema]="schema7" [formData]="sf7data" [button]="'none'" [ui]="ui7"> <sf #sf7 [schema]="schema7" [formData]="sf7data" [button]="'none'" [ui]="ui7">
<!-- <ng-template sf-template="receiptAddressId" let-i let-ui="ui">
<input
nz-input
[ngModel]="i.value"
(ngModelChange)="i.setValue($event)"
placeholder="请点击选择收回单地址"
(click)="backBillChange()"
/>
</ng-template> -->
<ng-template sf-template="paymentDays" let-i let-ui="ui"> <ng-template sf-template="paymentDays" let-i let-ui="ui">
<div nz-row> <div nz-row>
<div class="align-center2" style="width: 350px"> <div class="align-center" >
<div nz-col nzSpan="12"> <div nz-col nzSpan="16">
<nz-input-number <nz-input-number
[(ngModel)]="i.value" [(ngModel)]="i.value"
(ngModelChange)="i.setValue($event)" (ngModelChange)="i.setValue($event)"
@ -222,8 +208,8 @@
[nzStep]="1" [nzStep]="1"
></nz-input-number> ></nz-input-number>
</div> </div>
<div> <div nz-col nzSpan="8">
<span>&nbsp;&nbsp; 天内支付运费</span> <span>&nbsp;天内支付运费</span>
</div> </div>
</div> </div>
</div> </div>

36
src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.less
View File

@ -1,3 +1,17 @@
:host {
::ng-deep {
nz-input-number {
width: 100%;
}
nz-date-picker {
width: 100%;
}
}
i {
cursor: pointer;
}
}
.tip-font { .tip-font {
margin-left: 16px; margin-left: 16px;
font-weight: 500; font-weight: 500;
@ -15,16 +29,24 @@
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.align-center2 {
display: flex; .swap-icon {
align-items: center; padding: 24px;
color: #7d7d7d;
font-size: 30px;
:hover{color: #52acff;}
} }
#container { #container {
width: 300px; width: 300px;
height: 180px; height: 180px;
} }
:host {
::ng-deep { input[type='number'] {
nz-input-number{width: 100%;} -moz-appearance: textfield;
} }
input[type='number']::-webkit-inner-spin-button,
input[type='number']::-webkit-outer-spin-button {
margin: 0;
-webkit-appearance: none;
} }

23
src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts
View File

@ -361,6 +361,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
params: { dictKey: 'car:model' }, params: { dictKey: 'car:model' },
mode: 'multiple', mode: 'multiple',
placeholder: '请选择车型', placeholder: '请选择车型',
maxMultipleCount:3,
errors: { required: '请选择车型' } errors: { required: '请选择车型' }
} }
}, },
@ -372,6 +373,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
params: { dictKey: 'car:length' }, params: { dictKey: 'car:length' },
mode: 'multiple', mode: 'multiple',
placeholder: '请选择车长', placeholder: '请选择车长',
maxMultipleCount:3,
errors: { required: '请选择车长' } errors: { required: '请选择车长' }
} }
} }
@ -991,4 +993,25 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
} }
}); });
} }
// 装卸货地址互换
swapAddress(){
let item = this.startInfo;
this.startInfo = this.endInfo;
this.endInfo = item;
this.startInfo.forEach((element: any) => {
element.type = '1';
});
this.endInfo.forEach((element: any) => {
element.type = '2';
});
// 计算里程，时间
if (this.startInfo[0]?.area && this.endInfo[0]?.area) {
this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => {
this.totalDistance = res.distance;
this.totalTime = res.time;
});
}
}
} }

29
src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html
View File

@ -26,7 +26,7 @@
<div nz-col [nzSpan]="10"> <div nz-col [nzSpan]="10">
<div *ngFor="let data1 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]="3" nzRequired>装货地</nz-form-label>
<nz-form-control [nzErrorTip]="'请输入装货地'"> <nz-form-control [nzErrorTip]="'请输入装货地'">
<div class="align-center"> <div class="align-center">
<nz-input-group [nzSuffix]="endInconTemp1"> <nz-input-group [nzSuffix]="endInconTemp1">
@ -39,15 +39,12 @@
required required
/> />
</nz-input-group> </nz-input-group>
<!-- <span style="padding: 0 10px"
><i nz-icon nzType="menu" nzTheme="outline" style="color: #1890ff" (click)="chooseAddress(idx, 'start')"></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]="3" nzRequired>联系人</nz-form-label>
<div style="display: flex"> <div style="display: flex;width: 86%">
<nz-form-control [nzErrorTip]="'请输入联系人姓名'"> <nz-form-control [nzErrorTip]="'请输入联系人姓名'">
<input <input
nz-input nz-input
@ -75,13 +72,14 @@
</div> </div>
<div nz-col [nzSpan]="4"> <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 class="swap-icon" (click)="swapAddress()"><i nz-icon nzType="swap"
nzTheme="outline"></i></span>
</div> </div>
</div> </div>
<div nz-col [nzSpan]="10"> <div nz-col [nzSpan]="10">
<div *ngFor="let data2 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]="3" nzRequired>卸货地</nz-form-label>
<nz-form-control [nzErrorTip]="'请输入卸货地'"> <nz-form-control [nzErrorTip]="'请输入卸货地'">
<div class="align-center"> <div class="align-center">
<nz-input-group [nzSuffix]="endInconTemp1"> <nz-input-group [nzSuffix]="endInconTemp1">
@ -94,15 +92,12 @@
required required
/> />
</nz-input-group> </nz-input-group>
<!-- <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]="3" nzRequired>联系人</nz-form-label>
<div style="display: flex"> <div style="display: flex: flex;width: 86%">
<nz-form-control [nzErrorTip]="'请输入联系人姓名'"> <nz-form-control [nzErrorTip]="'请输入联系人姓名'">
<input <input
nz-input nz-input
@ -221,8 +216,8 @@
<sf #sf6 [schema]="schema6" [button]="'none'" [ui]="ui6" [formData]="sf6data"> <sf #sf6 [schema]="schema6" [button]="'none'" [ui]="ui6" [formData]="sf6data">
<ng-template sf-template="paymentDays" let-i let-ui="ui"> <ng-template sf-template="paymentDays" let-i let-ui="ui">
<div nz-row> <div nz-row>
<div class="align-center2" style="width: 350px"> <div class="align-center" >
<div nz-col nzSpan="12"> <div nz-col nzSpan="16">
<nz-input-number <nz-input-number
[ngModel]="i.value" [ngModel]="i.value"
[nzMin]="1" [nzMin]="1"
@ -232,8 +227,8 @@
nzPlaceHolder="请输入1-30" nzPlaceHolder="请输入1-30"
></nz-input-number> ></nz-input-number>
</div> </div>
<div> <div nz-col nzSpan="8">
<span>&nbsp;&nbsp; 天内支付运费</span> <span>&nbsp;天内支付运费</span>
</div> </div>
</div> </div>
</div> </div>

35
src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.less
View File

@ -1,3 +1,17 @@
:host {
::ng-deep {
nz-input-number {
width: 100%;
}
nz-date-picker {
width: 100%;
}
}
i {
cursor: pointer;
}
}
.tip-font { .tip-font {
margin-left: 16px; margin-left: 16px;
font-weight: 500; font-weight: 500;
@ -15,17 +29,24 @@
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.align-center2 {
display: flex; .swap-icon {
align-items: center; padding: 24px;
color: #7d7d7d;
font-size: 30px;
:hover{color: #52acff;}
} }
#container { #container {
width: 300px; width: 300px;
height: 180px; height: 180px;
} }
:host {
::ng-deep { input[type='number'] {
nz-input-number{width: 100%;} -moz-appearance: textfield;
} }
input[type='number']::-webkit-inner-spin-button,
input[type='number']::-webkit-outer-spin-button {
margin: 0;
-webkit-appearance: none;
} }

23
src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts
View File

@ -382,6 +382,7 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit {
params: { dictKey: 'car:model' }, params: { dictKey: 'car:model' },
mode: 'multiple', mode: 'multiple',
placeholder: '请选择车型', placeholder: '请选择车型',
maxMultipleCount:3,
errors: { required: '请选择车型' } errors: { required: '请选择车型' }
} }
}, },
@ -394,6 +395,7 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit {
params: { dictKey: 'car:length' }, params: { dictKey: 'car:length' },
mode: 'multiple', mode: 'multiple',
placeholder: '请选择车长', placeholder: '请选择车长',
maxMultipleCount:3,
errors: { required: '请选择车长' } errors: { required: '请选择车长' }
} }
} }
@ -755,4 +757,25 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit {
} }
}); });
} }
// 装卸货地址互换
swapAddress(){
let item = this.startInfo;
this.startInfo = this.endInfo;
this.endInfo = item;
this.startInfo.forEach((element: any) => {
element.type = '1';
});
this.endInfo.forEach((element: any) => {
element.type = '2';
});
// 计算里程，时间
if (this.startInfo[0]?.area && this.endInfo[0]?.area) {
this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => {
this.totalDistance = res.distance;
this.totalTime = res.time;
});
}
}
} }

51
src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html
View File

@ -16,10 +16,10 @@
> >
<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 data of startInfo; let idx = index">
<nz-form-item> <nz-form-item>
<nz-form-label [nzSpan]="4" nzRequired>装货地</nz-form-label> <nz-form-label [nzSpan]="3" nzRequired>装货地</nz-form-label>
<nz-form-control [nzErrorTip]="'请输入装货地'"> <nz-form-control [nzErrorTip]="'请输入装货地'">
<div class="align-center"> <div class="align-center">
<nz-input-group [nzSuffix]="endInconTemp1"> <nz-input-group [nzSuffix]="endInconTemp1">
@ -31,18 +31,16 @@
placeholder="请输入装货地" placeholder="请输入装货地"
/> />
</nz-input-group> </nz-input-group>
<!-- <span style="padding: 0 10px"
><i nz-icon nzType="menu" nzTheme="outline" style="color: #1890ff" (click)="chooseAddress(idx, 'start')"></i <span style="padding: 0 10px"
></span> -->
<span
><i nz-icon nzType="minus-circle-o" nzTheme="fill" style="color: #d9001b" (click)="subStartInfo($event, idx, data.id)"></i ><i nz-icon nzType="minus-circle-o" nzTheme="fill" style="color: #d9001b" (click)="subStartInfo($event, idx, data.id)"></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]="3" nzRequired>联系人</nz-form-label>
<div style="display: flex"> <div style="display: flex; width: 80.7%">
<nz-form-control [nzErrorTip]="'请输入联系人姓名'"> <nz-form-control [nzErrorTip]="'请输入联系人姓名'">
<input <input
nz-input nz-input
@ -74,15 +72,16 @@
</button> </button>
</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 class="swap-icon" (click)="swapAddress()"><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 data of endInfo; let idx = index">
<nz-form-item> <nz-form-item>
<nz-form-label [nzSpan]="4" nzRequired>卸货地</nz-form-label> <nz-form-label [nzSpan]="3" nzRequired>卸货地</nz-form-label>
<nz-form-control [nzErrorTip]="'请输入卸货地'"> <nz-form-control [nzErrorTip]="'请输入卸货地'">
<div class="align-center"> <div class="align-center">
<nz-input-group [nzSuffix]="endInconTemp1"> <nz-input-group [nzSuffix]="endInconTemp1">
@ -94,16 +93,13 @@
placeholder="请输入卸货地" placeholder="请输入卸货地"
/> />
</nz-input-group> </nz-input-group>
<!-- <span style="padding: 0 10px" <span style="padding: 0 10px"><i nz-icon nzType="minus-circle-o" nzTheme="fill" style="color: #d9001b" (click)="subEndInfo($event, idx)"></i></span>
><i nz-icon nzType="menu" nzTheme="outline" style="color: #1890ff" (click)="chooseAddress(idx, 'end')"></i
></span> -->
<span><i nz-icon nzType="minus-circle-o" nzTheme="fill" style="color: #d9001b" (click)="subEndInfo($event, 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]="3" nzRequired>联系人</nz-form-label>
<div style="display: flex"> <div style="display: flex; width: 80.7%">
<nz-form-control [nzErrorTip]="'请输入联系人姓名'"> <nz-form-control [nzErrorTip]="'请输入联系人姓名'">
<input <input
nz-input nz-input
@ -137,28 +133,31 @@
</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">
<nz-form-item> <nz-form-item>
<nz-form-label [nzSpan]="4" nzRequired>装货时间</nz-form-label> <nz-form-label [nzSpan]="3" nzRequired>装货时间</nz-form-label>
<nz-form-control [nzErrorTip]="'请输入装货时间'"> <nz-form-control [nzErrorTip]="'请输入装货时间'">
<nz-date-picker <nz-date-picker
nzShowTime nzShowTime
nzFormat="yyyy-MM-dd HH:mm:ss" nzFormat="yyyy-MM-dd HH:mm:ss"
[ngModel]="loadingTime" [ngModel]="loadingTime"
(ngModelChange)="changeLO($event)"[ngModelOptions]="{standalone: true}" (ngModelChange)="changeLO($event)"
[ngModelOptions]="{ standalone: true }"
></nz-date-picker> ></nz-date-picker>
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
</div> </div>
<div nz-col [nzSpan]="8"> <div nz-col [nzSpan]="4"></div>
<div nz-col [nzSpan]="10">
<nz-form-item> <nz-form-item>
<nz-form-label [nzSpan]="9" nzRequired>卸货时间</nz-form-label> <nz-form-label [nzSpan]="3" nzRequired>卸货时间</nz-form-label>
<nz-form-control [nzErrorTip]="'请输入卸货时间'"> <nz-form-control [nzErrorTip]="'请输入卸货时间'">
<nz-date-picker <nz-date-picker
nzShowTime nzShowTime
nzFormat="yyyy-MM-dd HH:mm:ss" nzFormat="yyyy-MM-dd HH:mm:ss"
[ngModel]="unloadingTime" [ngModel]="unloadingTime"
(ngModelChange)="changeUn($event)"[ngModelOptions]="{standalone: true}" (ngModelChange)="changeUn($event)"
[ngModelOptions]="{ standalone: true }"
></nz-date-picker> ></nz-date-picker>
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
@ -271,7 +270,7 @@
<nz-card> <nz-card>
<div class="card-title">补充信息</div> <div class="card-title">补充信息</div>
<div nz-row> <div nz-row>
<div nz-col nzSpan="12"> <div nz-col nzSpan="9">
<sf #sf6 [schema]="schema6" [formData]="sf6data" [button]="'none'" [ui]="ui6"> </sf> <sf #sf6 [schema]="schema6" [formData]="sf6data" [button]="'none'" [ui]="ui6"> </sf>
</div> </div>
</div> </div>
@ -279,7 +278,7 @@
<nz-card> <nz-card>
<div class="card-title">运费信息</div> <div class="card-title">运费信息</div>
<div nz-row> <div nz-row>
<div nz-col nzSpan="12"> <div nz-col nzSpan="9">
<sf #sf7 [schema]="schema7" [button]="'none'" [ui]="ui7" [formData]="sf7data"> <sf #sf7 [schema]="schema7" [button]="'none'" [ui]="ui7" [formData]="sf7data">
<ng-template sf-template="subtotal" let-i let-ui="ui">￥{{ i.value | number: '0.2-2' }}</ng-template> <ng-template sf-template="subtotal" let-i let-ui="ui">￥{{ i.value | number: '0.2-2' }}</ng-template>
<ng-template sf-template="appendFee" let-i let-ui="ui" <ng-template sf-template="appendFee" let-i let-ui="ui"

33
src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.less
View File

@ -1,3 +1,17 @@
:host {
::ng-deep {
nz-input-number {
width: 100%;
}
nz-date-picker {
width: 94.3%;
}
}
i {
cursor: pointer;
}
}
.tip-font { .tip-font {
margin-left: 16px; margin-left: 16px;
font-weight: 500; font-weight: 500;
@ -16,14 +30,23 @@
justify-content: center; justify-content: center;
} }
.swap-icon {
padding: 24px;
color: #7d7d7d;
font-size: 30px;
:hover{color: #52acff;}
}
#container { #container {
width: 300px; width: 300px;
height: 180px; height: 180px;
} }
input[type='number'] {
:host { -moz-appearance: textfield;
::ng-deep { }
nz-input-number{width: 100%;} input[type='number']::-webkit-inner-spin-button,
} input[type='number']::-webkit-outer-spin-button {
margin: 0;
-webkit-appearance: none;
} }

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

@ -325,6 +325,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
params: { dictKey: 'car:model' }, params: { dictKey: 'car:model' },
mode: 'multiple', mode: 'multiple',
placeholder: '请选择车型', placeholder: '请选择车型',
maxMultipleCount:3,
errors: { required: '请选择车型' } errors: { required: '请选择车型' }
} }
}, },
@ -336,6 +337,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
params: { dictKey: 'car:length' }, params: { dictKey: 'car:length' },
mode: 'multiple', mode: 'multiple',
placeholder: '请选择车长', placeholder: '请选择车长',
maxMultipleCount:3,
errors: { required: '请选择车长' } errors: { required: '请选择车长' }
} }
} }
@ -1223,4 +1225,42 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
} }
} }
} }
// 装卸货地址互换
swapAddress(){
this.startInfo.forEach((element:any, index:any) => {
this.validateForm1.removeControl(`loadAddress${index}`);
this.validateForm1.removeControl(`loadName${index}`);
this.validateForm1.removeControl(`loadPhone${index}`);
});
this.endInfo.forEach((element:any, index:any) => {
this.validateForm1.removeControl(`unloadAddress${index}`);
this.validateForm1.removeControl(`unloadName${index}`);
this.validateForm1.removeControl(`unloadPhone${index}`);
});
let item = this.startInfo;
this.startInfo = this.endInfo;
this.endInfo = item;
this.startInfo.forEach((element:any,index:any) => {
element.type = '1';
this.validateForm1.addControl(`loadAddress${index}`, new FormControl(null, Validators.required));
this.validateForm1.addControl(`loadName${index}`, new FormControl(null, Validators.required));
this.validateForm1.addControl(`loadPhone${index}`, new FormControl(null, [Validators.required, Validators.pattern('^[0-9]*$')]));
});
this.endInfo.forEach((element:any,index:any) => {
element.type = '2';
this.validateForm1.addControl(`unloadAddress${index}`, new FormControl(null, Validators.required));
this.validateForm1.addControl(`unloadName${index}`, new FormControl(null, Validators.required));
this.validateForm1.addControl(`unloadPhone${index}`, new FormControl(null, [Validators.required, Validators.pattern('^[0-9]*$')]));
});
// 计算里程，时间
if (this.startInfo[0]?.area && this.endInfo[0]?.area) {
this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => {
this.totalDistance = res.distance;
this.totalTime = res.time;
});
}
}
} }

74
src/app/routes/supply-management/components/release-publish/release-publish.component.html
View File

@ -26,7 +26,7 @@
<div nz-col [nzSpan]="10"> <div nz-col [nzSpan]="10">
<div *ngFor="let data1 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]="3" nzRequired>装货地</nz-form-label>
<nz-form-control [nzErrorTip]="'请输入装货地'"> <nz-form-control [nzErrorTip]="'请输入装货地'">
<div class="align-center"> <div class="align-center">
<nz-input-group [nzSuffix]="endInconTemp1"> <nz-input-group [nzSuffix]="endInconTemp1">
@ -38,18 +38,15 @@
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)="chooseAddress(idx, 'start')"></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)"></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]="3" nzRequired>联系人</nz-form-label>
<div style="display: flex;"> <div style="display: flex; width: 80.7%">
<nz-form-control [nzErrorTip]="'请输入联系人姓名'"> <nz-form-control [nzErrorTip]="'请输入联系人姓名'">
<input <input
nz-input nz-input
@ -76,17 +73,18 @@
</div> </div>
<div nz-row> <div nz-row>
<div nz-col [nzSpan]="4"></div> <div nz-col [nzSpan]="4"></div>
<div style="display: flex; justify-content: center;"> <div style="display: flex; justify-content: center">
<button nz-button nzType="primary" (click)="addStartInfo()"> <button nz-button nzType="primary" (click)="addStartInfo()">
<i nz-icon nzType="plus"></i> <i nz-icon nzType="plus"></i>
添加装货地 添加装货地
</button> </button>
</div> </div>
</div> </div>
</div> </div>
<div nz-col [nzSpan]="4"> <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 class="swap-icon" (click)="swapAddress()"><i nz-icon nzType="swap"
nzTheme="outline"></i></span>
</div> </div>
</div> </div>
<div nz-col [nzSpan]="10"> <div nz-col [nzSpan]="10">
@ -105,18 +103,15 @@
name="unloadAddress{{ idx }}" name="unloadAddress{{ idx }}"
/> />
</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)="chooseAddress(idx, 'end')"></i
></span> -->
<span *ngIf="idx !== 0"
><i nz-icon nzType="minus-circle-o" nzTheme="fill" style="color: #d9001b" (click)="subEndInfo($event, idx)"></i ><i nz-icon nzType="minus-circle-o" nzTheme="fill" style="color: #d9001b" (click)="subEndInfo($event, idx)"></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]="3" nzRequired>联系人</nz-form-label>
<div style="display: flex;"> <div style="display: flex; width: 80.7%">
<nz-form-control [nzErrorTip]="'请输入联系人姓名'"> <nz-form-control [nzErrorTip]="'请输入联系人姓名'">
<input <input
nz-input nz-input
@ -143,19 +138,19 @@
</div> </div>
<div nz-row> <div nz-row>
<div nz-col [nzSpan]="4"></div> <div nz-col [nzSpan]="4"></div>
<div style="display: flex; justify-content: center;"> <div style="display: flex; justify-content: center">
<button nz-button nzType="primary" (click)="addEndInfo()"> <button nz-button nzType="primary" (click)="addEndInfo()">
<i nz-icon nzType="plus"></i> <i nz-icon nzType="plus"></i>
添加卸货地 添加卸货地
</button> </button>
</div> </div>
</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]="10"> <div nz-col [nzSpan]="10">
<nz-form-item> <nz-form-item>
<nz-form-label [nzSpan]="4" nzRequired>装货时间</nz-form-label> <nz-form-label [nzSpan]="3" nzRequired>装货时间</nz-form-label>
<nz-form-control [nzErrorTip]="'请输入装货时间'"> <nz-form-control [nzErrorTip]="'请输入装货时间'">
<nz-date-picker nzShowTime nzFormat="yyyy-MM-dd HH:mm:ss" formControlName="loadingTime" name="loadingTime"></nz-date-picker> <nz-date-picker nzShowTime nzFormat="yyyy-MM-dd HH:mm:ss" formControlName="loadingTime" name="loadingTime"></nz-date-picker>
</nz-form-control> </nz-form-control>
@ -164,7 +159,7 @@
<div nz-col [nzSpan]="4"></div> <div nz-col [nzSpan]="4"></div>
<div nz-col [nzSpan]="10"> <div nz-col [nzSpan]="10">
<nz-form-item> <nz-form-item>
<nz-form-label [nzSpan]="4" nzRequired>卸货时间</nz-form-label> <nz-form-label [nzSpan]="3" nzRequired>卸货时间</nz-form-label>
<nz-form-control [nzErrorTip]="'请输入卸货时间'"> <nz-form-control [nzErrorTip]="'请输入卸货时间'">
<nz-date-picker nzShowTime nzFormat="yyyy-MM-dd HH:mm:ss" formControlName="unloadingTime" name="unloadingTime"></nz-date-picker> <nz-date-picker nzShowTime nzFormat="yyyy-MM-dd HH:mm:ss" formControlName="unloadingTime" name="unloadingTime"></nz-date-picker>
</nz-form-control> </nz-form-control>
@ -246,15 +241,22 @@
<sf #sf5 [schema]="schema5" [button]="'none'" [ui]="ui5" [formData]="sf5data"> <sf #sf5 [schema]="schema5" [button]="'none'" [ui]="ui5" [formData]="sf5data">
<ng-template sf-template="goodsValue" let-i let-ui="ui"> <ng-template sf-template="goodsValue" let-i let-ui="ui">
<div class="align-center"> <div class="align-center">
<nz-input-number [ngModel]="i.value" [nzMin]="50000" [nzMax]="3000000" [nzStep]="0.01" <nz-input-number
(ngModelChange)="i.setValue($event)" nzPlaceHolder="请输入50000-3000000之间数值"></nz-input-number> [ngModel]="i.value"
[nzMin]="50000"
[nzMax]="3000000"
[nzStep]="0.01"
(ngModelChange)="i.setValue($event)"
nzPlaceHolder="请输入50000-3000000之间数值"
></nz-input-number>
</div> </div>
</ng-template> </ng-template>
<ng-template sf-template="insureInfo" let-i let-ui="ui"> <ng-template sf-template="insureInfo" let-i let-ui="ui">
<div class="align-center"> <div class="align-center">
<input nz-input placeholder="保价费金额" [ngModel]="i.value" [disabled]="true" /> <input nz-input placeholder="保价费金额" [ngModel]="i.value" [disabled]="true" />
<span style="padding: 0 12px" nz-tooltip [nzTooltipTitle]="template2" nzTooltipPlacement="bottom"><i nz-icon <span style="padding: 0 12px" nz-tooltip [nzTooltipTitle]="template2" nzTooltipPlacement="bottom"
nzType="exclamation-circle" nzTheme="outline" style="color: #1890ff"></i></span> ><i nz-icon nzType="exclamation-circle" nzTheme="outline" style="color: #1890ff"></i
></span>
<ng-template #template2> <ng-template #template2>
<p>注意事项:</p> <p>注意事项:</p>
<p>①请仔细阅读《投保告知》</p> <p>①请仔细阅读《投保告知》</p>
@ -292,7 +294,9 @@
<div nz-col nzSpan="12"> <div nz-col nzSpan="12">
<sf #sf7 [schema]="schema7" [button]="'none'" [ui]="ui7" [formData]="sf7data"> <sf #sf7 [schema]="schema7" [button]="'none'" [ui]="ui7" [formData]="sf7data">
<ng-template sf-template="subtotal" let-i let-ui="ui">￥{{ i.value | number: '0.2-2' }}</ng-template> <ng-template sf-template="subtotal" let-i let-ui="ui">￥{{ i.value | number: '0.2-2' }}</ng-template>
<ng-template sf-template="appendFee" let-i let-ui="ui">￥{{ i.value| number: '0.2-2' }}（费率：{{ currentRate | number: '0.2-4' }}%）</ng-template> <ng-template sf-template="appendFee" let-i let-ui="ui"
>￥{{ i.value | number: '0.2-2' }}（费率：{{ currentRate | number: '0.2-4' }}%）</ng-template
>
<ng-template sf-template="total" let-i let-ui="ui">￥{{ i.value | number: '0.2-2' }}</ng-template> <ng-template sf-template="total" let-i let-ui="ui">￥{{ i.value | number: '0.2-2' }}</ng-template>
<ng-template sf-template="paymentDays" let-i let-ui="ui"> <ng-template sf-template="paymentDays" let-i let-ui="ui">
<div nz-row> <div nz-row>
@ -307,7 +311,7 @@
nzPlaceHolder="请输入1-30" nzPlaceHolder="请输入1-30"
></nz-input-number> ></nz-input-number>
</div> </div>
<div > <div>
<span>&nbsp;&nbsp; 天内支付运费</span> <span>&nbsp;&nbsp; 天内支付运费</span>
</div> </div>
</div> </div>
@ -319,7 +323,7 @@
</nz-card> </nz-card>
<nz-card> <nz-card>
<div class="align-center"> <div class="align-center">
<button nz-button nzType="primary" (click)="submitConfirm('assign')" >指派熟车</button> <button nz-button nzType="primary" (click)="submitConfirm('assign')">指派熟车</button>
<button nz-button nzType="primary" style="margin-left: 48px" (click)="submitConfirm('publish')" *ngIf="type === 'add'">司机抢单</button> <button nz-button nzType="primary" style="margin-left: 48px" (click)="submitConfirm('publish')" *ngIf="type === 'add'">司机抢单</button>
</div> </div>
</nz-card> </nz-card>

26
src/app/routes/supply-management/components/release-publish/release-publish.component.less
View File

@ -1,6 +1,14 @@
:host { :host {
::ng-deep { ::ng-deep {
nz-input-number{width: 100%;} nz-input-number {
width: 100%;
}
nz-date-picker {
width: 94.3%;
}
}
i {
cursor: pointer;
} }
} }
@ -22,9 +30,23 @@
justify-content: center; justify-content: center;
} }
.swap-icon {
padding: 24px;
color: #7d7d7d;
font-size: 30px;
:hover{color: #52acff;}
}
#container { #container {
width: 300px; width: 300px;
height: 180px; height: 180px;
} }
input[type='number'] {
-moz-appearance: textfield;
}
input[type='number']::-webkit-inner-spin-button,
input[type='number']::-webkit-outer-spin-button {
margin: 0;
-webkit-appearance: none;
}

40
src/app/routes/supply-management/components/release-publish/release-publish.component.ts
View File

@ -341,6 +341,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
params: { dictKey: 'car:model' }, params: { dictKey: 'car:model' },
mode: 'multiple', mode: 'multiple',
placeholder: '请选择车型', placeholder: '请选择车型',
maxMultipleCount:3,
errors: { required: '请选择车型' } errors: { required: '请选择车型' }
} }
}, },
@ -352,6 +353,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
params: { dictKey: 'car:length' }, params: { dictKey: 'car:length' },
mode: 'multiple', mode: 'multiple',
placeholder: '请选择车长', placeholder: '请选择车长',
maxMultipleCount:3,
errors: { required: '请选择车长' } errors: { required: '请选择车长' }
} }
} }
@ -972,4 +974,42 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
goBack() { goBack() {
window.history.go(-1); window.history.go(-1);
} }
// 装卸货地址互换
swapAddress(){
this.startInfo.forEach((element:any, index:any) => {
this.validateForm1.removeControl(`loadAddress${index}`);
this.validateForm1.removeControl(`loadName${index}`);
this.validateForm1.removeControl(`loadPhone${index}`);
});
this.endInfo.forEach((element:any, index:any) => {
this.validateForm1.removeControl(`unloadAddress${index}`);
this.validateForm1.removeControl(`unloadName${index}`);
this.validateForm1.removeControl(`unloadPhone${index}`);
});
let item = this.startInfo;
this.startInfo = this.endInfo;
this.endInfo = item;
this.startInfo.forEach((element:any,index:any) => {
element.type = '1';
this.validateForm1.addControl(`loadAddress${index}`, new FormControl(null, Validators.required));
this.validateForm1.addControl(`loadName${index}`, new FormControl(null, Validators.required));
this.validateForm1.addControl(`loadPhone${index}`, new FormControl(null, [Validators.required, Validators.pattern('^[0-9]*$')]));
});
this.endInfo.forEach((element:any,index:any) => {
element.type = '2';
this.validateForm1.addControl(`unloadAddress${index}`, new FormControl(null, Validators.required));
this.validateForm1.addControl(`unloadName${index}`, new FormControl(null, Validators.required));
this.validateForm1.addControl(`unloadPhone${index}`, new FormControl(null, [Validators.required, Validators.pattern('^[0-9]*$')]));
});
// 计算里程，时间
if (this.startInfo[0]?.area && this.endInfo[0]?.area) {
this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => {
this.totalDistance = res.distance;
this.totalTime = res.time;
});
}
}
} }