车辆对接
This commit is contained in:
wangshiming
@ -172,7 +172,9 @@ export class AccountComponentsCenterComponent implements OnInit {
|
||||
const modalRef = this.modalService.create({
|
||||
nzTitle: '设置/修改登录密码',
|
||||
nzContent: AccountComponentsCenterEditComponent,
|
||||
nzComponentParams: { },
|
||||
nzComponentParams: {
|
||||
record: this.infoData
|
||||
},
|
||||
});
|
||||
modalRef.afterClose.subscribe((result: any) => {
|
||||
if (result === true) {
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<!--
|
||||
* @Author: your name
|
||||
* @Date: 2021-11-29 11:06:01
|
||||
* @LastEditTime: 2021-12-27 20:37:25
|
||||
* @LastEditTime: 2021-12-28 14:11:58
|
||||
* @LastEditors: Please set LastEditors
|
||||
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
||||
* @FilePath: \tms-obc-web\src\app\routes\account\components\edit-name\edit-name.component.html
|
||||
@ -57,3 +57,16 @@
|
||||
<button nz-button nzType="primary" (click)="handleNew()">确定</button>
|
||||
</ng-template>
|
||||
</nz-modal>
|
||||
<nz-modal [(nzVisible)]="isVisibleOk" [nzWidth]="600" (nzOnCancel)="handleCancel('1')" [nzFooter]='null' >
|
||||
<ng-container *nzModalContent>
|
||||
<nz-result
|
||||
nzStatus="success"
|
||||
nzTitle="修改成功!"
|
||||
nzSubTitle="您已绑定新手机号，以后可用新手机号登录！"
|
||||
>
|
||||
<div nz-result-extra>
|
||||
<button nz-button nzType="primary" (click)="handleCancel('3')">确定</button>
|
||||
</div>
|
||||
</nz-result>
|
||||
</ng-container>
|
||||
</nz-modal>
|
||||
@ -24,6 +24,7 @@ export class AccountComponentsEditNameComponent implements OnInit, AfterViewInit
|
||||
ui!: SFUISchema;
|
||||
uiView: SFUISchema = {};
|
||||
isVisibleView = false;
|
||||
isVisibleOk = false;
|
||||
formData: any = {};
|
||||
count = 0;
|
||||
count2 = 0;
|
||||
@ -236,6 +237,8 @@ export class AccountComponentsEditNameComponent implements OnInit, AfterViewInit
|
||||
this.isVisibleView = false
|
||||
} else if(type === '2') {
|
||||
console.log(type)
|
||||
} else if(type === '3') {
|
||||
this.modal.close()
|
||||
}
|
||||
}
|
||||
handleOK() {
|
||||
@ -250,8 +253,8 @@ export class AccountComponentsEditNameComponent implements OnInit, AfterViewInit
|
||||
this.service.http.post(this.service.$api_get_verifyPhone, params).subscribe((res) => {
|
||||
console.log(res);
|
||||
if (res.success) {
|
||||
this.modal.close(true);
|
||||
this.service.msgSrv.success(res.msg);
|
||||
this.isVisibleOk = true;
|
||||
} else {
|
||||
this.service.msgSrv.warning(res.msg);
|
||||
}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<!--
|
||||
* @Author: your name
|
||||
* @Date: 2021-11-29 13:50:46
|
||||
* @LastEditTime: 2021-11-29 14:44:30
|
||||
* @LastEditTime: 2021-12-28 14:02:39
|
||||
* @LastEditors: Please set LastEditors
|
||||
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
||||
* @FilePath: \tms-obc-web\src\app\routes\account\components\edit\edit.component.html
|
||||
@ -9,13 +9,14 @@
|
||||
<form nz-form [formGroup]="validateForm">
|
||||
<nz-form-item>
|
||||
<nz-form-label nzRequired>新密码</nz-form-label>
|
||||
<nz-form-control nzErrorTip="请填写反馈类型,20字以内">
|
||||
<nz-input-group [nzSuffix]="suffixTemplate">
|
||||
<nz-form-control nzErrorTip="密码格式错误">
|
||||
<nz-input-group [nzSuffix]="suffixTemplate" name='passWord'>
|
||||
<input
|
||||
[type]="passwordVisible ? 'text' : 'password'"
|
||||
nz-input
|
||||
placeholder="input password"
|
||||
placeholder="请输入新密码"
|
||||
[(ngModel)]="password"
|
||||
formControlName="passWord"
|
||||
/>
|
||||
</nz-input-group>
|
||||
<ng-template #suffixTemplate>
|
||||
@ -25,12 +26,13 @@
|
||||
</nz-form-item>
|
||||
<nz-form-item>
|
||||
<nz-form-label nzRequired>确认新密码</nz-form-label>
|
||||
<nz-form-control nzErrorTip="请填写反馈类型,20字以内">
|
||||
<nz-input-group [nzSuffix]="suffixTemplate2">
|
||||
<nz-form-control nzErrorTip="密码不一致">
|
||||
<nz-input-group [nzSuffix]="suffixTemplate2" name='passWordTo'>
|
||||
<input
|
||||
[type]="passwordVisible2 ? 'text' : 'password'"
|
||||
nz-input
|
||||
placeholder="input password"
|
||||
formControlName="passWordTo"
|
||||
placeholder="请确认输入新密码"
|
||||
[(ngModel)]="password2"
|
||||
/>
|
||||
</nz-input-group>
|
||||
@ -41,30 +43,25 @@
|
||||
</nz-form-item>
|
||||
<nz-form-item>
|
||||
<nz-form-label nzRequired>手机号</nz-form-label>
|
||||
158****4444
|
||||
</nz-form-item>
|
||||
<nz-form-item>
|
||||
{{this.record?.phone}}
|
||||
</nz-form-item>
|
||||
<nz-form-item>
|
||||
<nz-form-label
|
||||
[nzSm]="6"
|
||||
[nzXs]="24"
|
||||
nzFor="captcha"
|
||||
nzFor="smsVerifyCode"
|
||||
nzRequired
|
||||
nzTooltipTitle="Please click 'Get captcha'"
|
||||
[nzTooltipIcon]="captchaTooltipIcon"
|
||||
>
|
||||
Captcha
|
||||
验证码
|
||||
</nz-form-label>
|
||||
<nz-form-control
|
||||
[nzSm]="14"
|
||||
[nzXs]="24"
|
||||
nzErrorTip="Please input the captcha you got!"
|
||||
nzExtra="We must make sure that your are a human."
|
||||
>
|
||||
<div nz-row [nzGutter]="8">
|
||||
<div nz-col [nzSpan]="12">
|
||||
<input nz-input formControlName="captcha" id="captcha" />
|
||||
<input nz-input formControlName="smsVerifyCode" id="smsVerifyCode" />
|
||||
</div>
|
||||
<div nz-col [nzSpan]="12">
|
||||
<div nz-col [nzSpan]="12" style="display: flex; align-items: center;">
|
||||
<button nz-button *ngIf="count < 1;" (click)="getCaptcha($event)">获取验证码</button>
|
||||
<span *ngIf="count > 1;">{{ count > 0 ? '请等待' + count + 's' : '获取验证码' }}</span>
|
||||
</div>
|
||||
@ -74,5 +71,20 @@
|
||||
</form>
|
||||
<div *nzModalFooter>
|
||||
<button nz-button nzType="default" (click)="destroyModal()">取消</button>
|
||||
<button nz-button nzType="primary" (click)="save()" >保存</button>
|
||||
<button nz-button nzType="primary" (click)="save()" >确定</button>
|
||||
</div>
|
||||
|
||||
|
||||
<nz-modal [(nzVisible)]="isVisibleView" [nzWidth]="600" (nzOnCancel)="handleCancel()" [nzFooter]='null' >
|
||||
<ng-container *nzModalContent>
|
||||
<nz-result
|
||||
nzStatus="success"
|
||||
nzTitle="密码设置成功!"
|
||||
nzSubTitle="请牢记您的新密码，修改密码后需重新登录，3秒后自动跳转至登录页..."
|
||||
>
|
||||
<div nz-result-extra>
|
||||
<button nz-button nzType="primary" (click)="handleOK()">重新登录</button>
|
||||
</div>
|
||||
</nz-result>
|
||||
</ng-container>
|
||||
</nz-modal>
|
||||
|
||||
@ -1,15 +1,17 @@
|
||||
/*
|
||||
* @Author: your name
|
||||
* @Date: 2021-11-29 13:50:46
|
||||
* @LastEditTime: 2021-11-29 14:58:33
|
||||
* @LastEditTime: 2021-12-28 14:19:32
|
||||
* @LastEditors: Please set LastEditors
|
||||
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
||||
* @FilePath: \tms-obc-web\src\app\routes\account\components\edit\edit.component.ts
|
||||
*/
|
||||
import { Component, OnInit, ViewChild } from '@angular/core';
|
||||
import { FormBuilder, FormGroup, Validators, ValidatorFn } from '@angular/forms';
|
||||
import { Component, Inject, OnInit, ViewChild } from '@angular/core';
|
||||
import { FormBuilder, FormControl, FormGroup, ValidatorFn, Validators } from '@angular/forms';
|
||||
import { ActivatedRoute, Router } from '@angular/router';
|
||||
import { STChange, STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st';
|
||||
import { DA_SERVICE_TOKEN, ITokenService } from '@delon/auth';
|
||||
|
||||
import { SFComponent, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
|
||||
import { NzDrawerRef, NzDrawerService } from 'ng-zorro-antd/drawer';
|
||||
import { NzFormTooltipIcon } from 'ng-zorro-antd/form';
|
||||
@ -21,17 +23,25 @@ import { AccountService } from '../../services/account.service';
|
||||
templateUrl: './edit-password.component.html'
|
||||
})
|
||||
export class AccountComponentsCenterEditComponent implements OnInit {
|
||||
url = `/rule?_allow_anonymous=true`;
|
||||
validateForm!: FormGroup;
|
||||
record: any;
|
||||
count = 0;
|
||||
type = 'create';
|
||||
isVisibleView = false
|
||||
passwordVisible = false;
|
||||
passwordVisible2 = false;
|
||||
password?: string;
|
||||
password2?: string;
|
||||
password: any;
|
||||
password2: any;
|
||||
interval$: any;
|
||||
confirmPasswordValidator!: ValidatorFn;
|
||||
confirmationValidator =
|
||||
(control: FormControl): { [s: string]: boolean } => {
|
||||
if (!control.value) {
|
||||
return { required: true };
|
||||
} else if (control?.value !== this.validateForm?.value?.passWord) {
|
||||
return { confirm: true, error: true };
|
||||
}
|
||||
return {};
|
||||
};
|
||||
captchaTooltipIcon: NzFormTooltipIcon = {
|
||||
type: 'info-circle',
|
||||
theme: 'twotone'
|
||||
@ -41,25 +51,27 @@ export class AccountComponentsCenterEditComponent implements OnInit {
|
||||
public ar: ActivatedRoute,
|
||||
private modalRef: NzModalRef,
|
||||
private fb: FormBuilder,
|
||||
public service: AccountService
|
||||
public service: AccountService,
|
||||
@Inject(DA_SERVICE_TOKEN) private tokenService: ITokenService
|
||||
) {}
|
||||
|
||||
ngOnInit() {
|
||||
this.validateForm = this.fb.group({
|
||||
passWord: [
|
||||
null,
|
||||
[
|
||||
Validators.required,
|
||||
Validators.maxLength(16),
|
||||
Validators.minLength(8),
|
||||
Validators.pattern('^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z-_]{8,16}$')
|
||||
]
|
||||
],
|
||||
passWordTo: [null, [this.confirmPasswordValidator, Validators.required, Validators.maxLength(16), Validators.minLength(8)]],
|
||||
voucher: [null, [Validators.required]]
|
||||
});
|
||||
this.initForm();
|
||||
console.log(this.record.phone)
|
||||
}
|
||||
|
||||
initForm () {
|
||||
this.validateForm = this.fb.group({
|
||||
passWord: [null,
|
||||
[
|
||||
Validators.required,
|
||||
Validators.maxLength(16),
|
||||
Validators.minLength(8),
|
||||
Validators.pattern('^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z-_]{8,16}$')
|
||||
]],
|
||||
passWordTo: [null, [ Validators.required, Validators.maxLength(16), Validators.minLength(8), this.confirmationValidator,]],
|
||||
smsVerifyCode: [null, [Validators.required]],
|
||||
});
|
||||
}
|
||||
destroyModal(): void {
|
||||
this.modalRef.destroy();
|
||||
}
|
||||
@ -71,23 +83,36 @@ export class AccountComponentsCenterEditComponent implements OnInit {
|
||||
this.service.msgSrv.success('发送成功');
|
||||
e.preventDefault();
|
||||
this.codeCountDown();
|
||||
} else if (res.code === '503046') {
|
||||
// this.dun.popUp();
|
||||
} else {
|
||||
}else {
|
||||
this.service.msgSrv.success(res.msg);
|
||||
}
|
||||
});
|
||||
}
|
||||
save() {
|
||||
// const params = { id: this.record.id, name: this.validateForm.value.name };
|
||||
// this.service.request(this.service.$api_feedbackTypeupdate, params).subscribe((res) => {
|
||||
// if (res) {
|
||||
// this.modalRef.close(true);
|
||||
// this.service.msgSrv.success('保存成功！');
|
||||
// } else {
|
||||
// this.service.msgSrv.error(res.msg);
|
||||
// }
|
||||
// });
|
||||
if(!this.validateForm.valid) {
|
||||
this.service.msgSrv.warning('必填项为空或格式错误，请检查！')
|
||||
return;
|
||||
}
|
||||
console.log(this.validateForm)
|
||||
console.log(this.validateForm.value)
|
||||
const params = {
|
||||
...this.validateForm.value
|
||||
};
|
||||
console.log(params)
|
||||
|
||||
this.service.request(this.service.$api_set_phoneUpdatePassword, params).subscribe((res) => {
|
||||
if (res) {
|
||||
this.service.msgSrv.success('修改密码成功！');
|
||||
this.isVisibleView = true;
|
||||
setTimeout(() => {
|
||||
this.tokenService.clear();
|
||||
this.router.navigate(['/passport/login'])
|
||||
this.modalRef.close()
|
||||
}, 3000)
|
||||
} else {
|
||||
this.service.msgSrv.error(res.msg);
|
||||
}
|
||||
});
|
||||
}
|
||||
/* code倒计时 */
|
||||
codeCountDown() {
|
||||
@ -99,11 +124,12 @@ export class AccountComponentsCenterEditComponent implements OnInit {
|
||||
}
|
||||
}, 1000);
|
||||
}
|
||||
submitForm(): void {
|
||||
// tslint:disable-next-line: forin
|
||||
for (const i in this.validateForm.controls) {
|
||||
this.validateForm.controls[i].markAsDirty();
|
||||
this.validateForm.controls[i].updateValueAndValidity();
|
||||
}
|
||||
}
|
||||
handleCancel() {
|
||||
this.isVisibleView = false
|
||||
}
|
||||
handleOK() {
|
||||
this.modalRef.close()
|
||||
this.tokenService.clear();
|
||||
this.router.navigate(['/passport/login'])
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/*
|
||||
* @Author: your name
|
||||
* @Date: 2021-11-02 11:12:21
|
||||
* @LastEditTime: 2021-12-27 17:10:47
|
||||
* @LastEditTime: 2021-12-28 13:52:35
|
||||
* @LastEditors: Please set LastEditors
|
||||
* @Description: In User Settings Edit
|
||||
* @FilePath: \scm-ows-ui\src\app\routes\account\services\account.service.ts
|
||||
@ -31,6 +31,8 @@ export class AccountService extends BaseService {
|
||||
|
||||
// 凭证修改手机号
|
||||
$api_set_voucherUpdatePhone = `/api/mdc/cuc/userBasicInfo/forgetPassword/voucherUpdatePhone`;
|
||||
// 凭证修改密码
|
||||
$api_set_phoneUpdatePassword = `/api/mdc/cuc/userBasicInfo/phoneUpdatePassword`;
|
||||
constructor(public injector: Injector) {
|
||||
super(injector);
|
||||
}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<!--
|
||||
* @Author: your name
|
||||
* @Date: 2021-12-03 15:31:52
|
||||
* @LastEditTime: 2021-12-28 10:46:37
|
||||
* @LastEditTime: 2021-12-28 16:31:50
|
||||
* @LastEditors: Please set LastEditors
|
||||
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
||||
* @FilePath: \tms-obc-web\src\app\routes\order-management\components\vehicle-detail\vehicle-detail.component.html
|
||||
@ -31,51 +31,26 @@
|
||||
<sv label="网络货运人">{{ i?.goodsResource?.[0]?.enterpriseInfoName }} </sv>
|
||||
<sv label="货主">{{ i?.goodsResource?.[0]?.shipperAppUserName }} </sv>
|
||||
<sv label="所属项目">{{i?.goodsResource?.[0]?.enterpriseProjectName}}</sv>
|
||||
<sv label="服务类型">{{i?.goodsResource?.[0]?.serviceTypeLabel}}</sv>
|
||||
<sv label="录单员">{{i?.goodsResource?.[0]?.dispatchName}} 18100000000 </sv>
|
||||
<sv label="服务类型8">{{i?.goodsResource?.[0]?.serviceTypeLabel}}</sv>
|
||||
<sv label="录单员">{{i?.createUserNameLabel}} </sv>
|
||||
<sv label="调度员">{{i?.goodsResource?.[0]?.dispatchName}} </sv>
|
||||
</div>
|
||||
<nz-tabset style="margin-top: 15px;">
|
||||
<nz-tab [nzTitle]="tempt" >
|
||||
<ng-template #tempt>
|
||||
<nz-anchor>
|
||||
<nz-link nzHref="#distannce1" nzTitle="装卸货信息"></nz-link>
|
||||
</nz-anchor>
|
||||
</ng-template>
|
||||
<nz-tab nzTitle="装卸货信息" (nzClick)="goDistance(distannce1)">
|
||||
</nz-tab>
|
||||
<nz-tab [nzTitle]="tempt2" >
|
||||
<ng-template #tempt2>
|
||||
<nz-anchor>
|
||||
<nz-link nzHref="#distannce2" nzTitle="基本信息"></nz-link>
|
||||
</nz-anchor>
|
||||
</ng-template>
|
||||
<nz-tab nzTitle="基本信息" (nzClick)="goDistance(distannce2)">
|
||||
</nz-tab>
|
||||
<nz-tab [nzTitle]="tempt3" >
|
||||
<ng-template #tempt3>
|
||||
<nz-anchor>
|
||||
<nz-link nzHref="#distannce3" nzTitle="运费信息"></nz-link>
|
||||
</nz-anchor>
|
||||
</ng-template>
|
||||
<nz-tab nzTitle="运费信息" (nzClick)="goDistance(distannce3)">
|
||||
</nz-tab>
|
||||
<nz-tab [nzTitle]="tempt4" >
|
||||
<ng-template #tempt4>
|
||||
<nz-anchor>
|
||||
<nz-link nzHref="#distannce4" nzTitle="附件信息"></nz-link>
|
||||
</nz-anchor>
|
||||
</ng-template>
|
||||
<nz-tab nzTitle="附件信息" (nzClick)="goDistance(distannce4)">
|
||||
</nz-tab>
|
||||
<nz-tab [nzTitle]="tempt5" >
|
||||
<ng-template #tempt5>
|
||||
<nz-anchor>
|
||||
<nz-link nzHref="#distannce5" nzTitle="轨迹信息"></nz-link>
|
||||
</nz-anchor>
|
||||
</ng-template>
|
||||
<nz-tab nzTitle="轨迹信息" (nzClick)="goDistance(distannce5)">
|
||||
</nz-tab>
|
||||
</nz-tabset>
|
||||
</div>
|
||||
</ng-template>
|
||||
</page-header-wrapper>
|
||||
<nz-card nzTitle="运单进度">
|
||||
<nz-card nzTitle="运单进度" #distannce1>
|
||||
<div class="approval-status">
|
||||
<div style="width: 60%; margin: 0 auto">
|
||||
<nz-steps [nzCurrent]="i?.scheduleVOList?.length + 1" nzLabelPlacement="vertical">
|
||||
@ -91,7 +66,7 @@
|
||||
</div>
|
||||
</nz-card>
|
||||
|
||||
<nz-card nzTitle="基本信息">
|
||||
<nz-card nzTitle="基本信息" #distannce2>
|
||||
<sv-container col="1">
|
||||
<sv label="货物名称">
|
||||
{{i?.goodsInfoList?.[0]?.goodsName}}
|
||||
@ -105,10 +80,10 @@
|
||||
{{i?.goodsInfoList?.[0]?.maxWeightLabel}}/{{i?.goodsInfoList?.[0]?.maxCube}}
|
||||
</sv>
|
||||
<sv label="承运司机">
|
||||
{{i?.driverId}}
|
||||
{{i?.driverName}}/{{i?.driverPhone}}{{i?.carNo}}
|
||||
</sv>
|
||||
<sv label="车型车长载重">
|
||||
{{i?.goodsInfoList?.[0]?.weight}}吨,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件
|
||||
{{i?.carModel}},{{i?.carLength}},{{i?.carLoad ? i?.carLoad +'吨': ''}}
|
||||
</sv>
|
||||
<sv label="计划装货时间">
|
||||
{{i?.loadPlanTime}}
|
||||
@ -129,10 +104,10 @@
|
||||
<div class="mt-md">
|
||||
<h4 class="text-md">装货卸货信息
|
||||
<span class="ml-sm text-sm">(
|
||||
<label>{{i?.loadingCount}}装</label>
|
||||
<label>{{i?.unloadingCount}}卸</label>
|
||||
)
|
||||
<label>{{i?.loadingCount || '一'}}装</label>
|
||||
<label>{{i?.unloadingCount || '一'}}卸</label>
|
||||
</span>
|
||||
)
|
||||
</h4>
|
||||
<div nz-row [nzGutter]="24">
|
||||
<div nz-col [nzSpan]="12">
|
||||
@ -164,16 +139,20 @@
|
||||
</div>
|
||||
</div>
|
||||
</nz-card>
|
||||
<nz-card nzTitle="运费信息" id="distannce3">
|
||||
<nz-card nzTitle="运费信息" #distannce3>
|
||||
<h2>{{i?.goodsInfoList?.[0]?.freightPrice}}{{i?.goodsInfoList?.[0]?.freightTypeLabel}}（以发货为准，保留小数）</h2>
|
||||
<st #st [data]="i?.billExpenseDetails" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
|
||||
|
||||
</st>
|
||||
<div>总计：{{i?.total | currency: '￥'}}（运费￥3500.00，附加运费￥191.98，附加费率3.5%）</div>
|
||||
<div>收款人：</div>
|
||||
<div>
|
||||
总计：<span style="color: #da001b; font-size: 18px">{{ totalObj?.price | currency: '￥' }}</span> （运费￥{{
|
||||
totalObj?.price - attObj?.price
|
||||
}}，附加运费￥{{ attObj?.price }}，附加费率{{ (attObj?.price / totalObj?.price) * 100 | number: '0.2-2' }}%）
|
||||
</div>
|
||||
<div>收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}</div>
|
||||
</nz-card>
|
||||
|
||||
<nz-card nzTitle="附件信息" id="distannce4">
|
||||
<nz-card nzTitle="附件信息" #distannce4>
|
||||
<sv-container>
|
||||
<sv label="协议附件">
|
||||
<!-- {{i?.supplementaryInformationVO?.stateReceipt?'是':'否'}} -->
|
||||
@ -223,7 +202,7 @@
|
||||
|
||||
<nz-card>
|
||||
<div nz-row>
|
||||
<nz-card nzTitle="轨迹信息" style="width: 100%;" id="distannce5">
|
||||
<nz-card nzTitle="轨迹信息" style="width: 100%;" #distannce5>
|
||||
<div nz-row >
|
||||
<div nz-col [nzSpan]='12'>
|
||||
<!-- <st #st [data]="i?.auditRecordList" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
|
||||
|
||||
@ -2,7 +2,7 @@ import { Router } from '@angular/router';
|
||||
/*
|
||||
* @Author: your name
|
||||
* @Date: 2021-12-03 15:31:52
|
||||
* @LastEditTime: 2021-12-24 17:40:51
|
||||
* @LastEditTime: 2021-12-28 16:23:04
|
||||
* @LastEditors: Please set LastEditors
|
||||
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
||||
* @FilePath: \tms-obc-web\src\app\routes\order-management\components\vehicle-detail\vehicle-detail.component.ts
|
||||
@ -14,6 +14,7 @@ import { _HttpClient } from '@delon/theme';
|
||||
import { NzMessageService } from 'ng-zorro-antd/message';
|
||||
import { NzModalService } from 'ng-zorro-antd/modal';
|
||||
import { OrderManagementService } from '../../services/order-management.service';
|
||||
import { NzCardComponent } from 'ng-zorro-antd/card';
|
||||
@Component({
|
||||
selector: 'app-supply-management-bulk-detail',
|
||||
templateUrl: './bulk-detail.component.html',
|
||||
@ -25,6 +26,8 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
|
||||
id = this.route.snapshot.params.id;
|
||||
i: any;
|
||||
imges: any;
|
||||
totalObj: any;
|
||||
attObj: any;
|
||||
isVisible = false;
|
||||
logColumns: STColumn[] = [
|
||||
{ title: '款项', index: 'expenseName' },
|
||||
@ -66,6 +69,8 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
|
||||
console.log(res)
|
||||
if (res) {
|
||||
this.i =res;
|
||||
this.attObj = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'ATT')[0];
|
||||
this.totalObj = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'TOTAL')[0];
|
||||
}
|
||||
})
|
||||
}
|
||||
@ -93,4 +98,9 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
|
||||
handleOK() {
|
||||
this.isVisible = false
|
||||
}
|
||||
goDistance(elf: NzCardComponent) {
|
||||
if (elf) {
|
||||
elf['elementRef'].nativeElement.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'start' });
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,11 +1,12 @@
|
||||
<!--
|
||||
* @Author: your name
|
||||
* @Date: 2021-12-03 15:31:52
|
||||
* @LastEditTime: 2021-12-28 09:56:51
|
||||
* @LastEditTime: 2021-12-28 16:32:53
|
||||
* @LastEditors: Please set LastEditors
|
||||
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
||||
* @FilePath: \tms-obc-web\src\app\routes\order-management\components\vehicle-detail\vehicle-detail.component.html
|
||||
-->
|
||||
<nz-affix [nzOffsetTop]="10">
|
||||
<page-header-wrapper [title]="''" [logo]="logo" [content]="headerContent">
|
||||
<ng-template #logo>
|
||||
<button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
|
||||
@ -52,6 +53,7 @@
|
||||
</div>
|
||||
</ng-template>
|
||||
</page-header-wrapper>
|
||||
</nz-affix>
|
||||
<nz-card nzTitle="运单进度" #distannce1>
|
||||
<div class="approval-status">
|
||||
<div style="width: 60%; margin: 0 auto">
|
||||
@ -64,7 +66,7 @@
|
||||
</div>
|
||||
</nz-card>
|
||||
|
||||
<nz-card nzTitle="基本信息" #distannce2>
|
||||
<nz-card nzTitle="基本信息" #distannce2 >
|
||||
<sv-container col="1">
|
||||
<sv-title>货物信息</sv-title>
|
||||
<sv label="网络货运人">
|
||||
@ -82,14 +84,14 @@
|
||||
{{i?.goodsInfoList?.[0]?.maxWeightLabel}}/{{i?.goodsInfoList?.[0]?.maxCube}}
|
||||
</sv>
|
||||
<sv label="承运司机">
|
||||
<!-- {{i?.driverId}} -->
|
||||
{{i?.driverName}}/{{i?.driverPhone}}/{{i?.carNo}}
|
||||
</sv>
|
||||
<sv label="车型车长载重">
|
||||
{{i?.goodsInfoList?.[0]?.weight}}顿,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件
|
||||
{{i?.carModel}},{{i?.carLength}},{{i?.carLoad ? i?.carLoad +'吨': ''}}
|
||||
</sv>
|
||||
</sv-container>
|
||||
<div class="mt-md">
|
||||
<h4 class="text-md">装货卸货信息
|
||||
<div class="mt-md" >
|
||||
<h4 class="text-md" >装货卸货信息
|
||||
<span class="ml-sm text-sm">(
|
||||
<label>{{i?.loadingCount}}装</label>
|
||||
<label>{{i?.unloadingCount}}卸</label>
|
||||
@ -135,8 +137,12 @@
|
||||
<st #st [data]="i?.billExpenseDetails" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
|
||||
|
||||
</st>
|
||||
<div>总计：{{i?.total | currency: '￥'}}（运费￥3500.00，附加运费￥191.98，附加费率3.5%）</div>
|
||||
<div>收款人：</div>
|
||||
<div>
|
||||
总计：<span style="color: #da001b; font-size: 18px">{{ totalObj?.price | currency: '￥' }}</span> （运费￥{{
|
||||
totalObj?.price - attObj?.price
|
||||
}}，附加运费￥{{ attObj?.price }}，附加费率{{ (attObj?.price / totalObj?.price) * 100 | number: '0.2-2' }}%）
|
||||
</div>
|
||||
<div>收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}</div>
|
||||
</nz-card>
|
||||
|
||||
<nz-card nzTitle="附件信息" id="distannce4" #distannce4>
|
||||
@ -206,7 +212,7 @@
|
||||
<nz-modal [(nzVisible)]="isVisible" [nzFooter]="nzModalFooter" nzTitle="附件信息" (nzOnOk)="handleOK()"
|
||||
(nzOnCancel)="handleCancel()">
|
||||
<ng-container *nzModalContent>
|
||||
<app-imagelist [imgList]="[imges]"></app-imagelist>
|
||||
<app-imagelist [imgList]="imges"></app-imagelist>
|
||||
</ng-container>
|
||||
<ng-template #nzModalFooter>
|
||||
<button nz-button nzType="primary" (click)="handleOK()" [disabled]="">取消</button>
|
||||
|
||||
@ -2,7 +2,7 @@ import { ViewChild } from '@angular/core';
|
||||
/*
|
||||
* @Author: your name
|
||||
* @Date: 2021-12-03 15:31:52
|
||||
* @LastEditTime: 2021-12-27 21:05:48
|
||||
* @LastEditTime: 2021-12-28 16:22:50
|
||||
* @LastEditors: Please set LastEditors
|
||||
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
||||
* @FilePath: \tms-obc-web\src\app\routes\order-management\components\vehicle-detail\vehicle-detail.component.ts
|
||||
@ -29,6 +29,8 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
|
||||
goodsResource: []
|
||||
};
|
||||
imges: any;
|
||||
attObj: any;
|
||||
totalObj: any;
|
||||
approvalLsit: any;
|
||||
isVisible = false;
|
||||
logColumns: STColumn[] = [
|
||||
@ -72,6 +74,8 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
|
||||
if (res) {
|
||||
this.i = res;
|
||||
this.approvalLsit = res.scheduleVOList;
|
||||
this.attObj = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'ATT')[0];
|
||||
this.totalObj = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'TOTAL')[0];
|
||||
this.approvalLsit.map((item: any, key: any) => {
|
||||
console.log(item);
|
||||
if (item.displayStatus === 'HIDE') {
|
||||
@ -108,7 +112,7 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
|
||||
|
||||
goDistance(elf: NzCardComponent) {
|
||||
if (elf) {
|
||||
elf['elementRef'].nativeElement.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'start' });
|
||||
elf['elementRef'].nativeElement.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'start' , yOffset : 400 });
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<!--
|
||||
* @Author: your name
|
||||
* @Date: 2021-12-03 15:31:52
|
||||
* @LastEditTime: 2021-12-28 10:07:21
|
||||
* @LastEditTime: 2021-12-28 16:24:57
|
||||
* @LastEditors: Please set LastEditors
|
||||
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
||||
* @FilePath: \tms-obc-web\src\app\routes\order-management\components\vehicle-detail\vehicle-detail.component.html
|
||||
@ -14,7 +14,7 @@
|
||||
</ng-template>
|
||||
<ng-template #headerContent>
|
||||
<div class="mb-xs" nz-row>
|
||||
<button nz-button nzType="primary" nzSize="small" nzDanger>{{i?.billStatusLabel}}</button>
|
||||
<button nz-button nzType="primary" nzSize="small" nzDanger>{{i?.wayBillStatusLabel}}</button>
|
||||
<h4 class="ml-md" style="font-size: 18px;">运单号: {{ i?.billCode }}</h4>
|
||||
</div>
|
||||
<div nz-row style="display: flex; justify-content: end;">
|
||||
@ -32,41 +32,16 @@
|
||||
<sv label="服务类型">{{i?.goodsResource?.[0]?.serviceTypeLabel}}</sv>
|
||||
<sv label="调度员">{{i?.goodsResource?.[0]?.dispatchName}} </sv>
|
||||
</div>
|
||||
<nz-tabset nzType="card" style="margin-top: 15px;">
|
||||
<nz-tab [nzTitle]="tempt" >
|
||||
<ng-template #tempt>
|
||||
<nz-anchor>
|
||||
<nz-link nzHref="#distannce1" nzTitle="装卸货信息"></nz-link>
|
||||
</nz-anchor>
|
||||
</ng-template>
|
||||
<nz-tabset style="margin-top: 15px;">
|
||||
<nz-tab nzTitle="装卸货信息" (nzClick)="goDistance(distannce1)">
|
||||
</nz-tab>
|
||||
<nz-tab [nzTitle]="tempt2" >
|
||||
<ng-template #tempt2>
|
||||
<nz-anchor>
|
||||
<nz-link nzHref="#distannce2" nzTitle="基本信息"></nz-link>
|
||||
</nz-anchor>
|
||||
</ng-template>
|
||||
<nz-tab nzTitle="基本信息" (nzClick)="goDistance(distannce1)">
|
||||
</nz-tab>
|
||||
<nz-tab [nzTitle]="tempt3" >
|
||||
<ng-template #tempt3>
|
||||
<nz-anchor>
|
||||
<nz-link nzHref="#distannce3" nzTitle="运费信息"></nz-link>
|
||||
</nz-anchor>
|
||||
</ng-template>
|
||||
<nz-tab nzTitle="运费信息" (nzClick)="goDistance(distannce3)">
|
||||
</nz-tab>
|
||||
<nz-tab [nzTitle]="tempt4" >
|
||||
<ng-template #tempt4>
|
||||
<nz-anchor>
|
||||
<nz-link nzHref="#distannce4" nzTitle="附件信息"></nz-link>
|
||||
</nz-anchor>
|
||||
</ng-template>
|
||||
<nz-tab nzTitle="附件信息" (nzClick)="goDistance(distannce4)">
|
||||
</nz-tab>
|
||||
<nz-tab [nzTitle]="tempt5" >
|
||||
<ng-template #tempt5>
|
||||
<nz-anchor>
|
||||
<nz-link nzHref="#distannce5" nzTitle="轨迹信息"></nz-link>
|
||||
</nz-anchor>
|
||||
</ng-template>
|
||||
<nz-tab nzTitle="轨迹信息" (nzClick)="goDistance(distannce5)">
|
||||
</nz-tab>
|
||||
</nz-tabset>
|
||||
</div>
|
||||
@ -88,24 +63,24 @@
|
||||
</div>
|
||||
</nz-card>
|
||||
|
||||
<nz-card nzTitle="基本信息">
|
||||
<nz-card nzTitle="基本信息" #distannce1>
|
||||
<sv-container col="1">
|
||||
<sv label="货物名称">
|
||||
{{i?.goodsInfoList?.[0]?.goodsName}}
|
||||
{{i?.goodsInfos?.[0]?.goodsName}}
|
||||
</sv>
|
||||
</sv-container>
|
||||
<sv-container col="2">
|
||||
<sv label="货物数量">
|
||||
{{i?.goodsInfoList?.[0]?.weight}}吨,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件
|
||||
{{i?.goodsInfos?.[0]?.weight}}吨,{{i?.goodsInfos?.[0]?.volume}}方,{{i?.goodsInfos?.[0]?.number}}件
|
||||
</sv>
|
||||
<sv label="用车需求">
|
||||
{{i?.goodsInfoList?.[0]?.maxWeightLabel}}/{{i?.goodsInfoList?.[0]?.maxCube}}
|
||||
{{i?.goodsInfos?.[0]?.maxWeightLabel}}/{{i?.goodsInfos?.[0]?.maxCube}}
|
||||
</sv>
|
||||
<sv label="承运司机">
|
||||
{{i?.driverId}}
|
||||
{{i?.driver?.name}}/{{i?.driver?.phone}}
|
||||
</sv>
|
||||
<sv label="车型车长载重">
|
||||
{{i?.goodsInfoList?.[0]?.weight}}吨,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件
|
||||
{{i?.goodsInfos?.[0]?.weight}}吨,{{i?.goodsInfos?.[0]?.volume}}方,{{i?.goodsInfos?.[0]?.number}}件
|
||||
</sv>
|
||||
<sv label="计划装货时间">
|
||||
{{i?.loadPlanTime}}
|
||||
@ -126,15 +101,15 @@
|
||||
<div class="mt-md">
|
||||
<h4 class="text-md">装货卸货信息
|
||||
<span class="ml-sm text-sm">(
|
||||
<label>{{i?.loadingCount}}装</label>
|
||||
<label>{{i?.unloadingCount}}卸</label>
|
||||
<label>{{i?.loadingCount || '一'}}装</label>
|
||||
<label>{{i?.unloadingCount || '一'}}卸</label>
|
||||
)
|
||||
</span>
|
||||
</h4>
|
||||
<div nz-row [nzGutter]="24">
|
||||
<div nz-col [nzSpan]="12">
|
||||
<div class="handling-info p-md">
|
||||
<div class="flex" *ngFor="let item of i?.unLoadingPlaceVOList">
|
||||
<div class="flex" *ngFor="let item of i?.loadingPlace">
|
||||
<div *ngIf="item.type === '1'" class="loading-row">
|
||||
<div class="handling-info-icon loading-bg">装</div>
|
||||
<div class="info">
|
||||
@ -147,7 +122,7 @@
|
||||
</div>
|
||||
<div nz-col [nzSpan]="12">
|
||||
<div class="handling-info p-md">
|
||||
<div class="flex" *ngFor="let item of i?.unLoadingPlaceVOList">
|
||||
<div class="flex" *ngFor="let item of i?.loadingPlace">
|
||||
<div *ngIf="item.type === '2'" class="loading-row">
|
||||
<div class="handling-info-icon unloaing-bg">卸</div>
|
||||
<div class="info">
|
||||
@ -161,16 +136,24 @@
|
||||
</div>
|
||||
</div>
|
||||
</nz-card>
|
||||
<nz-card nzTitle="运费信息" id="distannce3">
|
||||
<h2>{{i?.goodsInfoList?.[0]?.freightPrice}}{{i?.goodsInfoList?.[0]?.freightTypeLabel}}（以发货为准，保留小数）</h2>
|
||||
<st #st [data]="i?.billExpenseDetails" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
|
||||
<nz-card nzTitle="运费信息" #distannce3>
|
||||
<div style="margin-bottom: 18px">
|
||||
<span style="color: #da001b; font-size: 18px"> {{ i?.goodsInfos?.[0]?.freightPrice }}{{ i?.goodsInfos?.[0]?.freightTypeLabel }} </span>（{{ i?.goodsInfos?.[0]?.settlementBasisLabel }}，{{
|
||||
i?.goodsInfos?.[0]?.ruleLabel
|
||||
}}）</div
|
||||
>
|
||||
<st #st [data]="i?.billExpenseDetailVOList" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
|
||||
|
||||
</st>
|
||||
<div>总计：{{i?.total | currency: '￥'}}（运费￥3500.00，附加运费￥191.98，附加费率3.5%）</div>
|
||||
<div>收款人：</div>
|
||||
<div>
|
||||
总计：<span style="color: #da001b; font-size: 18px">{{ totalObj?.price | currency: '￥' }}</span> （运费￥{{
|
||||
totalObj?.price - attObj?.price
|
||||
}}，附加运费￥{{ attObj?.price }}，附加费率{{ (attObj?.price / totalObj?.price) * 100 | number: '0.2-2' }}%）
|
||||
</div>
|
||||
<div>收款人：{{ i?.payeeName }}{{ i?.payeePhone }}</div>
|
||||
</nz-card>
|
||||
|
||||
<nz-card nzTitle="附件信息" id="distannce4">
|
||||
<nz-card nzTitle="附件信息" #distannce4>
|
||||
<sv-container>
|
||||
<sv label="协议附件">
|
||||
<!-- {{i?.supplementaryInformationVO?.stateReceipt?'是':'否'}} -->
|
||||
@ -220,7 +203,7 @@
|
||||
|
||||
<nz-card>
|
||||
<div nz-row>
|
||||
<nz-card nzTitle="轨迹信息" style="width: 100%;" id="distannce5">
|
||||
<nz-card nzTitle="轨迹信息" style="width: 100%;" #distannce5>
|
||||
<div nz-row >
|
||||
<div nz-col [nzSpan]='12'>
|
||||
<!-- <st #st [data]="i?.auditRecordList" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/*
|
||||
* @Author: your name
|
||||
* @Date: 2021-12-03 15:31:52
|
||||
* @LastEditTime: 2021-12-20 16:23:36
|
||||
* @LastEditTime: 2021-12-28 16:19:46
|
||||
* @LastEditors: Please set LastEditors
|
||||
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
||||
* @FilePath: \tms-obc-web\src\app\routes\order-management\components\vehicle-detail\vehicle-detail.component.ts
|
||||
@ -10,6 +10,7 @@ import { Component, OnInit } from '@angular/core';
|
||||
import { ActivatedRoute } from '@angular/router';
|
||||
import { STColumn } from '@delon/abc/st';
|
||||
import { _HttpClient } from '@delon/theme';
|
||||
import { NzCardComponent } from 'ng-zorro-antd/card';
|
||||
import { NzMessageService } from 'ng-zorro-antd/message';
|
||||
import { NzModalService } from 'ng-zorro-antd/modal';
|
||||
import { WaybillManagementServe } from '../../services/waybill-management.service';
|
||||
@ -22,6 +23,8 @@ export class WaybillManagementBulkeDetailComponent implements OnInit {
|
||||
|
||||
id = this.route.snapshot.params.id;
|
||||
i: any;
|
||||
totalObj: any;
|
||||
attObj: any;
|
||||
isVisible = false;
|
||||
logColumns: STColumn[] = [
|
||||
{ title: '时间', index: 'operationUserPhone' },
|
||||
@ -53,6 +56,8 @@ export class WaybillManagementBulkeDetailComponent implements OnInit {
|
||||
this.unLoadingPlaceVOList.push(...res.dischargePlace)
|
||||
console.log(this.unLoadingPlaceVOList)
|
||||
this.i = res;
|
||||
this.attObj = this.i?.billExpenseDetailVOList?.filter((data: any) => data.expenseCode === 'ATT')[0];
|
||||
this.totalObj = this.i?.billExpenseDetailVOList?.filter((data: any) => data.expenseCode === 'TOTAL')[0];
|
||||
})
|
||||
}
|
||||
|
||||
@ -88,4 +93,9 @@ export class WaybillManagementBulkeDetailComponent implements OnInit {
|
||||
handleOK() {
|
||||
this.isVisible = false
|
||||
}
|
||||
goDistance(elf: NzCardComponent) {
|
||||
if (elf) {
|
||||
elf['elementRef'].nativeElement.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'start' });
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user