fix bug
This commit is contained in:
wangshiming
@ -96,18 +96,15 @@
|
||||
<div class="freight-info-box">
|
||||
<h3 style="font-weight: 700;">运费信息</h3>
|
||||
<div class="text-right">
|
||||
<p>预付：{{dataList?.expenseList?.prePay | currency: '￥' }}</p>
|
||||
<p>油卡：{{dataList?.expenseList?.oilCardPay | currency: '￥'}}</p>
|
||||
<p>到付：{{dataList?.expenseList?.toPay | currency: '￥'}}</p>
|
||||
<p>回单付：{{dataList?.expenseList?.receiptPay | currency: '￥'}}</p>
|
||||
<p>保险费：{{dataList?.expenseList?.insuranceFee | currency: '￥'}}</p>
|
||||
<p>附加费保险费：{{dataList?.expenseList?.appendFee | currency: '￥'}}</p>
|
||||
<p style="color: #f9b523;">到货后15天内支付运费</p>
|
||||
<p>以发货为准，保留小数</p>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<nz-divider></nz-divider>
|
||||
<div class="freight-info-box" nz-row>
|
||||
<div nz-col nzSpan="24">
|
||||
<h3 class="text-right"><label>总计 :</label> <span class="text-error-dark text-xl">{{dataList?.expenseList?.totalFee | currency: '￥' }}</span></h3>
|
||||
<h3 class="text-right"><label>单价 :</label> <span class="text-error-dark text-xl" style="color: red;">{{dataList?.freightPrice }}</span>元/吨</h3>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/*
|
||||
* @Author: your name
|
||||
* @Date: 2021-12-03 11:10:14
|
||||
* @LastEditTime: 2021-12-08 17:04:35
|
||||
* @LastEditTime: 2021-12-09 21:21:27
|
||||
* @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\supply-management\components\bulk-detail\bulk-detail.component.ts
|
||||
@ -120,13 +120,17 @@ export class SupplyManagementBulkDetailComponent implements OnInit {
|
||||
// 修改货源
|
||||
modification() {
|
||||
this.router.navigate(['/supply-management/vehicle-amend', this.id], {
|
||||
relativeTo: this.ar
|
||||
queryParams: {
|
||||
sta: 3
|
||||
},
|
||||
})
|
||||
}
|
||||
// 再下一单
|
||||
nextOrder() {
|
||||
this.router.navigate(['/supply-management/vehicle-amend', this.id], {
|
||||
relativeTo: this.ar
|
||||
queryParams: {
|
||||
sta: 4
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@ -26,8 +26,8 @@
|
||||
<span style="padding: 0 10px"
|
||||
><i nz-icon nzType="menu" nzTheme="outline" style="color: #1890ff" (click)="openMap('start', idx)"></i
|
||||
></span>
|
||||
<span *ngIf="idx !== 0"
|
||||
><i nz-icon nzType="minus-circle-o" nzTheme="fill" style="color: #d9001b" (click)="subStartInfo($event, idx)">X</i
|
||||
<span
|
||||
><i nz-icon nzType="minus-circle-o" nzTheme="fill" style="color: #d9001b" (click)="subStartInfo($event, idx, data.id)">X</i
|
||||
></span>
|
||||
</div>
|
||||
</nz-form-control>
|
||||
@ -62,7 +62,7 @@
|
||||
<input nz-input [(ngModel)]="data.detailedAddress" [ngModelOptions]="{ standalone: true }" />
|
||||
</nz-input-group>
|
||||
<span style="padding: 0 10px"><i nz-icon nzType="menu" nzTheme="outline" style="color: #1890ff"></i></span>
|
||||
<span *ngIf="idx !== 0"
|
||||
<span
|
||||
><i nz-icon nzType="minus-circle-o" nzTheme="fill" style="color: #d9001b" (click)="subEndInfo($event, idx)">X</i
|
||||
></span>
|
||||
</div>
|
||||
@ -175,15 +175,18 @@
|
||||
<div nz-row>
|
||||
<div nz-col nzSpan="12">
|
||||
<sf #sf7 [schema]="schema7" [formData]="sf7data" [button]="'none'" [ui]="ui7">
|
||||
<ng-template sf-template="name5" let-i let-ui="ui">￥0.00</ng-template>
|
||||
<ng-template sf-template="name6" let-i let-ui="ui">￥0.00</ng-template>
|
||||
<ng-template sf-template="name7" let-i let-ui="ui">￥0.00</ng-template>
|
||||
<ng-template sf-template="totalFee" let-i let-ui="ui" >{{totalFees | currency: '￥'}}</ng-template>
|
||||
<ng-template sf-template="name8" let-i let-ui="ui">
|
||||
<ng-template sf-template="totalFee" let-i let-ui="ui" >
|
||||
<div *ngIf="this.PageStatus === '整车修改' || this.PageStatus === '整车下一单'">{{totalFees | currency: '￥'}}</div>
|
||||
<div *ngIf="this.PageStatus === '大宗修改' || this.PageStatus === '大宗下一单'">
|
||||
<nz-input-number [(ngModel)]="totalFees" (ngModelChange)="i.setValue($event)" [nzMin]="1" [nzStep]="0.01"></nz-input-number>
|
||||
</div>
|
||||
</ng-template>
|
||||
<ng-template sf-template="paymentDays" let-i let-ui="ui">
|
||||
<div nz-row>
|
||||
<div class="align-center">
|
||||
<div nz-col nzSpan="16">
|
||||
<input nz-input [ngModel]="i.value" (ngModelChange)="i.setValue($event)" />
|
||||
<!-- <input nz-input [ngModel]="i.value" (ngModelChange)="i.setValue($event)" /> -->
|
||||
<nz-input-number [(ngModel)]="i.value" (ngModelChange)="i.setValue($event)" [nzMin]="1" [nzMax]="30" [nzStep]="1"></nz-input-number>
|
||||
</div>
|
||||
<div nz-col nzSpan="8">
|
||||
<span>天内支付运费</span>
|
||||
|
||||
@ -38,6 +38,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
|
||||
unit3 = '保价费金额';
|
||||
startInfo: any = [];
|
||||
endInfo: any = [];
|
||||
PageStatus = '';
|
||||
dataList: any;
|
||||
constructor(private http: _HttpClient, fb: FormBuilder, private router: Router, private route: ActivatedRoute, private modalService: NzModalService, public service: SupplyManagementService) {
|
||||
this.validateForm1 = fb.group({
|
||||
@ -73,6 +74,16 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
|
||||
schema7: SFSchema = {};
|
||||
ui7!: SFUISchema;
|
||||
ngOnInit(): void {
|
||||
if(this.route.snapshot?.queryParams?.sta === '1') {
|
||||
console.log('修改')
|
||||
this.PageStatus = '整车修改';
|
||||
} else if(this.route.snapshot?.queryParams?.sta === '2') {
|
||||
this.PageStatus = '整车下一单';
|
||||
} else if(this.route.snapshot?.queryParams?.sta === '3') {
|
||||
this.PageStatus = '大宗修改';
|
||||
} else if(this.route.snapshot?.queryParams?.sta === '4') {
|
||||
this.PageStatus = '大宗下一单';
|
||||
}
|
||||
this.initSF1();
|
||||
// this.initSF2();
|
||||
this.initSF3();
|
||||
@ -81,7 +92,6 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
|
||||
this.initSF6();
|
||||
this.initSF7();
|
||||
this.initdata();
|
||||
console.log( this.route.snapshot?.queryParams)
|
||||
}
|
||||
|
||||
initSF1() {
|
||||
@ -187,7 +197,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
|
||||
initSF3() {
|
||||
this.schema3 = {
|
||||
properties: {
|
||||
goodsNameId: {
|
||||
goodsName: {
|
||||
type: 'string',
|
||||
title: '货物名称',
|
||||
enum: [
|
||||
@ -214,7 +224,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
|
||||
title: '',
|
||||
ui: {
|
||||
visibleIf: {
|
||||
goodsNameId: value => value === '3'
|
||||
goodsName: value => value === '3'
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -225,7 +235,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
|
||||
spanLabelFixed: 90,
|
||||
grid: { span: 12 }
|
||||
},
|
||||
$goodsNameId: {
|
||||
$goodsName: {
|
||||
grid: { span: 12 }
|
||||
},
|
||||
$qita: {
|
||||
@ -273,7 +283,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
|
||||
// change: (i) => this.updateCategory(i, '/categoryId2'),
|
||||
} as SFSelectWidgetSchema
|
||||
},
|
||||
name6: {
|
||||
maxCube: {
|
||||
type: 'string',
|
||||
title: '',
|
||||
enum: [
|
||||
@ -310,7 +320,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
|
||||
$vehicleDemand: {
|
||||
grid: { span: 12 }
|
||||
},
|
||||
$name6: {
|
||||
$maxCube: {
|
||||
grid: { span: 12 }
|
||||
}
|
||||
};
|
||||
@ -380,38 +390,42 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
|
||||
};
|
||||
}
|
||||
changeValue() {
|
||||
this.totalFees = this.sf7?.value?.appendFee + this.sf7?.value?.oilCardPay + this.sf7?.value?.prePay +this.sf7?.value?.receiptPay + this.sf7?.value?.toPay
|
||||
this.totalFees = Number(this.sf7?.value?.appendFee) + Number(this.sf7?.value?.oilCardPay) + Number(this.sf7?.value?.prePay) + Number(this.sf7?.value?.receiptPay) + Number(this.sf7?.value?.toPay)
|
||||
console.log(this.totalFees)
|
||||
}
|
||||
initSF7() {
|
||||
if(this.PageStatus === '整车修改' || this.PageStatus === '整车下一单') {
|
||||
this.schema7 = {
|
||||
properties: {
|
||||
prePay: { type: 'number', title: '预付', default: 0, ui: { prefix: '￥', change: ()=> {
|
||||
this.changeValue();
|
||||
} } as SFNumberWidgetSchema },
|
||||
},
|
||||
} as SFNumberWidgetSchema },
|
||||
toPay: { type: 'number', title: '到付', default: 0, ui: { prefix: '￥',change: ()=> {
|
||||
this.changeValue();
|
||||
} } as SFNumberWidgetSchema },
|
||||
oilCardPay: { type: 'number', title: '油卡', default: 0, ui: { prefix: '￥',change: ()=> {
|
||||
this.changeValue();
|
||||
} } as SFNumberWidgetSchema },
|
||||
},
|
||||
} as SFNumberWidgetSchema },
|
||||
oilCardPay: { type: 'number', title: '油卡', default: 0, ui: { prefix: '￥',change: ()=> {this.changeValue();} ,
|
||||
} as SFNumberWidgetSchema },
|
||||
receiptPay: { type: 'number', title: '回单付', default: 0, ui: { prefix: '￥',change: ()=> {
|
||||
this.changeValue();
|
||||
} } as SFNumberWidgetSchema },
|
||||
this.changeValue();},
|
||||
} as SFNumberWidgetSchema },
|
||||
oilCardPay2: {
|
||||
type: 'string',
|
||||
title: '小计',
|
||||
ui: {
|
||||
widget: 'custom',
|
||||
placeholder: '请输入'
|
||||
}
|
||||
placeholder: '请输入',
|
||||
},
|
||||
},
|
||||
appendFee: {
|
||||
type: 'string',
|
||||
title: '附加费',
|
||||
ui: {
|
||||
widget: 'custom',
|
||||
placeholder: '请输入'
|
||||
}
|
||||
placeholder: '请输入',
|
||||
},
|
||||
|
||||
},
|
||||
totalFee: {
|
||||
type: 'string',
|
||||
@ -421,9 +435,22 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
|
||||
placeholder: '请输入'
|
||||
}
|
||||
},
|
||||
name8: {
|
||||
paymentDays: {
|
||||
type: 'string',
|
||||
title: '到货后',
|
||||
ui: {
|
||||
widget: 'custom',
|
||||
placeholder: '请输入',
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
} else {
|
||||
this.schema7 = {
|
||||
properties: {
|
||||
totalFee: {
|
||||
type: 'string',
|
||||
title: '总费用',
|
||||
ui: {
|
||||
widget: 'custom',
|
||||
placeholder: '请输入'
|
||||
@ -431,6 +458,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
this.ui7 = {
|
||||
'*': {
|
||||
spanLabelFixed: 90,
|
||||
@ -447,7 +475,13 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
|
||||
type: 1
|
||||
});
|
||||
}
|
||||
subStartInfo(event: any, index: number) {
|
||||
subStartInfo(event: any, index: number, id?:any) {
|
||||
console.log(event, index, id)
|
||||
if(id) {
|
||||
this.service.request(this.service.$api_delete_Wholedeletebatch, [id]).subscribe((res) => {
|
||||
console.log(res)
|
||||
})
|
||||
}
|
||||
this.startInfo.splice(index, 1);
|
||||
}
|
||||
|
||||
@ -459,7 +493,13 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
|
||||
type: 2
|
||||
});
|
||||
}
|
||||
subEndInfo(event: any, index: number) {
|
||||
subEndInfo(event: any, index: number, id?:any) {
|
||||
if(id) {
|
||||
this.service.request(this.service.$api_delete_Wholedeletebatch, [id]).subscribe((res) => {
|
||||
console.log(res)
|
||||
})
|
||||
}
|
||||
console.log(event, index, id)
|
||||
this.endInfo.splice(index, 1);
|
||||
}
|
||||
|
||||
@ -476,8 +516,6 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
|
||||
this.validateForm1.controls[key].markAsDirty();
|
||||
this.validateForm1.controls[key].updateValueAndValidity();
|
||||
});
|
||||
console.log(this.validateForm1);
|
||||
|
||||
if(typeof(this.validateForm1.value.modifyTime) !== 'string' ) {
|
||||
var c = new Date(this.validateForm1.value.modifyTime);
|
||||
this.validateForm1.value.modifyTime = c.getFullYear() + '-' + (c.getMonth() + 1) + '-' + c.getDate() + ' ' + c.getHours() + ':' + c.getMinutes() + ':' + c.getSeconds()
|
||||
@ -486,38 +524,45 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
|
||||
var c = new Date(this.validateForm1.value.createTime);
|
||||
this.validateForm1.value.createTime = c.getFullYear() + '-' + (c.getMonth() + 1) + '-' + c.getDate() + ' ' + c.getHours() + ':' + c.getMinutes() + ':' + c.getSeconds()
|
||||
}
|
||||
console.log(typeof(this.validateForm1.value.createTime) === 'string')
|
||||
if (this.validateForm1.invalid) {
|
||||
return;
|
||||
}
|
||||
console.log({...this.sf4.value, ...this.sf3.value})
|
||||
this.startInfo.createTime = this.validateForm1.value.createTime
|
||||
this.startInfo.modifyTime = this.validateForm1.value.modifyTime
|
||||
const params = {
|
||||
const params: any = {
|
||||
...this.sf1.value,
|
||||
...this.sf5.value,
|
||||
shippingInformationDTO: {
|
||||
...this.sf7.value
|
||||
},
|
||||
unLoadingPlaceList: [...this.startInfo, ...this.endInfo,],
|
||||
goodsInfoList: [
|
||||
unLoadingPlaceDTOList: [...this.startInfo, ...this.endInfo,],
|
||||
goodsInfoDTOList: [
|
||||
{...this.sf4.value, ...this.sf3.value}
|
||||
]
|
||||
}
|
||||
console.log(params)
|
||||
console.log(this.startInfo)
|
||||
console.log(this.endInfo)
|
||||
console.log(this.validateForm1.value)
|
||||
console.log(this.sf3.value)
|
||||
console.log(this.sf4.value)
|
||||
console.log(this.sf5.value)
|
||||
console.log(this.sf6.value)
|
||||
if(this.PageStatus === '整车修改' || this.PageStatus === '整车下一单') {
|
||||
params.shippingInformationDTO = {
|
||||
...this.sf7.value,
|
||||
totalFees: this.totalFees
|
||||
}
|
||||
} else {
|
||||
params.freightPrice = this.totalFees
|
||||
}
|
||||
console.log(this.sf7.value)
|
||||
this.service.request(this.service.$api_set_saveAnotherWholeOrder, params).subscribe((res: any) => {
|
||||
console.log(res)
|
||||
})
|
||||
console.log(params)
|
||||
if(this.PageStatus === '整车修改') {
|
||||
this.requests(this.service.$api_set_WholeModify, params);
|
||||
} else if(this.PageStatus === '整车下一单') {
|
||||
this.requests(this.service.$api_set_saveAnotherWholeOrder, params);
|
||||
} else if(this.PageStatus === '大宗修改') {
|
||||
this.requests(this.service.$api_set_bulkModify, params);
|
||||
} else if(this.PageStatus === '大宗下一单') {
|
||||
this.requests(this.service.$api_set_saveAnotherBulkOrder, params);
|
||||
}
|
||||
|
||||
}
|
||||
requests(url: any, params: any) {
|
||||
this.service.request(url, params).subscribe((res: any) => {
|
||||
console.log(res)
|
||||
})
|
||||
}
|
||||
|
||||
openMap(type: string, index: number) {
|
||||
const modalRef = this.modalService.create({
|
||||
nzTitle: '',
|
||||
@ -549,40 +594,64 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
|
||||
}
|
||||
// 初始化信息
|
||||
initdata() {
|
||||
console.log(this.id)
|
||||
if(this.PageStatus === '整车修改' || this.PageStatus === '整车下一单') {
|
||||
this.service.request(`${this.service.$api_get_getCompleteVehicleDetail}`, {id:this.id}).subscribe((res) => {
|
||||
console.log(res)
|
||||
// this.dataList = res;
|
||||
this.sf1data = {
|
||||
// shipperAppUserName: res?.shipperAppUserName || '',
|
||||
enterpriseProjectName: res?.enterpriseProjectName || '',
|
||||
enterpriseInfoName: res?.enterpriseInfoName || '',
|
||||
externalResourceCode: res?.externalResourceCode || '',
|
||||
dispatchId: res?.dispatchId || '',
|
||||
}
|
||||
res.unLoadingPlaceList.forEach((element: any) => {
|
||||
if(element.type === 1) {
|
||||
if(this.id) {
|
||||
this.startInfo.push({
|
||||
detailedAddress: element.detailedAddress,
|
||||
appUserName: element.appUserName,
|
||||
contractTelephone: element.contractTelephone,
|
||||
type: element.type
|
||||
})
|
||||
} else {
|
||||
this.startInfo.push({
|
||||
detailedAddress: element.detailedAddress,
|
||||
appUserName: element.appUserName,
|
||||
contractTelephone: element.contractTelephone,
|
||||
type: element.type,
|
||||
id: element.id
|
||||
})
|
||||
}
|
||||
if(element.createTime) {
|
||||
this.creatTime = element?.createTime
|
||||
this.modifyTime = element?.modifyTime
|
||||
}
|
||||
} else if(element.type === 2) {
|
||||
this.dataR(res);
|
||||
})
|
||||
} else if(this.PageStatus === '大宗修改' || this.PageStatus === '大宗下一单') {
|
||||
this.service.request(`${this.service.$api_get_getBulkDetail}`, {id:this.id}).subscribe((res) => {
|
||||
this.dataR(res);
|
||||
})
|
||||
}
|
||||
}
|
||||
asds(i: any) {
|
||||
console.log(i)
|
||||
}
|
||||
// const data =
|
||||
dataR (res: any) {
|
||||
// this.dataList = res;
|
||||
this.sf1data = {
|
||||
// shipperAppUserName: res?.shipperAppUserName || '',
|
||||
enterpriseProjectName: res?.enterpriseProjectName || '',
|
||||
enterpriseInfoName: res?.enterpriseInfoName || '',
|
||||
externalResourceCode: res?.externalResourceCode || '',
|
||||
dispatchId: res?.dispatchId || '',
|
||||
}
|
||||
if(this.PageStatus === '整车修改' || this.PageStatus === '大宗修改') {
|
||||
this.sf1data.id = res?.id;
|
||||
}
|
||||
res?.unLoadingPlaceList.forEach((element: any) => {
|
||||
if(element.type === 1) {
|
||||
if(this.PageStatus === '整车修改' || this.PageStatus === '大宗修改') {
|
||||
this.startInfo.push({
|
||||
detailedAddress: element.detailedAddress,
|
||||
appUserName: element.appUserName,
|
||||
contractTelephone: element.contractTelephone,
|
||||
type: element.type,
|
||||
id: element.id
|
||||
})
|
||||
} else {
|
||||
this.startInfo.push({
|
||||
detailedAddress: element.detailedAddress,
|
||||
appUserName: element.appUserName,
|
||||
contractTelephone: element.contractTelephone,
|
||||
type: element.type,
|
||||
})
|
||||
}
|
||||
if(element.createTime) {
|
||||
this.creatTime = element?.createTime
|
||||
this.modifyTime = element?.modifyTime
|
||||
}
|
||||
} else if(element.type === 2) {
|
||||
if(this.PageStatus === '整车修改' || this.PageStatus === '大宗修改') {
|
||||
this.endInfo.push({
|
||||
detailedAddress: element?.detailedAddress,
|
||||
appUserName: element?.appUserName,
|
||||
contractTelephone: element?.contractTelephone,
|
||||
type: element.type,
|
||||
id: element.id
|
||||
})
|
||||
} else {
|
||||
this.endInfo.push({
|
||||
detailedAddress: element?.detailedAddress,
|
||||
appUserName: element?.appUserName,
|
||||
@ -590,53 +659,64 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
|
||||
type: element.type
|
||||
})
|
||||
}
|
||||
});
|
||||
this.sf3data = {
|
||||
goodsNameId: res?.goodsInfoList[0]?.goodsNameId || '',
|
||||
|
||||
}
|
||||
this.sf4data = {
|
||||
weight: res?.goodsInfoList[0]?.weight || '',
|
||||
volume: res?.goodsInfoList[0]?.volume || '',
|
||||
vehicleDemand: res?.goodsInfoList[0]?.vehicleDemand || '',
|
||||
}
|
||||
this.sf5data = {
|
||||
goodsValue: res?.goodsValue || '',
|
||||
}
|
||||
this.sf6data = {
|
||||
stateReceipt: res?.supplementaryInformationVO?.stateReceipt || '',
|
||||
remarks: res?.supplementaryInformationVO?.remarks || '',
|
||||
}
|
||||
console.log('99999')
|
||||
console.log(res?.shippingInformationVO)
|
||||
this.sf7data = {
|
||||
prePay: res?.shippingInformationVO?.prePay || '',
|
||||
toPay: res?.shippingInformationVO?.toPay || '',
|
||||
oilCardPay: res?.shippingInformationVO?.oilCardPay || '',
|
||||
receiptPay: res?.shippingInformationVO?.receiptPay || '',
|
||||
oilCardPay2: res?.shippingInformationVO?.oilCardPay || '',
|
||||
appendFee: res?.shippingInformationVO?.appendFee || '',
|
||||
name8: res?.shippingInformationVO?.appendFee || '',
|
||||
}
|
||||
this.totalFees = res?.shippingInformationVO?.totalFee || '0';
|
||||
// <p>预付：{{dataList?.shippingInformationVO?.prePay | currency: '￥' }}</p>
|
||||
// <p>油卡：{{dataList?.shippingInformationVO?.oilCardPay | currency: '￥'}}</p>
|
||||
// <p>到付：{{dataList?.shippingInformationVO?.toPay | currency: '￥'}}</p>
|
||||
// <p>回单付：{{dataList?.shippingInformationVO?.receiptPay | currency: '￥'}}</p>
|
||||
// <p>保险费：{{dataList?.shippingInformationVO?.insuranceFee | currency: '￥'}}</p>
|
||||
// <p>附加费保险费：{{dataList?.shippingInformationVO?.appendFee | currency: '￥'}}</p> totalFee
|
||||
console.log(this.sf1.value)
|
||||
console.log(this.startInfo)
|
||||
console.log(this.endInfo)
|
||||
console.log(this.validateForm1.value)
|
||||
console.log(this.sf3.value)
|
||||
console.log(this.sf4.value)
|
||||
console.log(this.sf5.value)
|
||||
console.log(this.sf6.value)
|
||||
|
||||
})
|
||||
});
|
||||
this.sf3data = {
|
||||
goodsName: res?.goodsInfoList[0]?.goodsName || '',
|
||||
}
|
||||
this.sf4data = {
|
||||
weight: res?.goodsInfoList[0]?.weight || '',
|
||||
volume: res?.goodsInfoList[0]?.volume || '',
|
||||
vehicleDemand: res?.goodsInfoList[0]?.vehicleDemand || '',
|
||||
maxCube: res?.goodsInfoList[0]?.maxCube || '',
|
||||
maxWeight: res?.goodsInfoList[0]?.maxWeight || '',
|
||||
number: res?.goodsInfoList[0]?.number || '',
|
||||
freightPrice: res?.goodsInfoList[0]?.freightPrice || '',
|
||||
freightType: res?.goodsInfoList[0]?.freightType || '',
|
||||
goodsType: res?.goodsInfoList[0]?.goodsType || '',
|
||||
modifyTime: res?.goodsInfoList[0]?.modifyTime || '',
|
||||
modifyUserId: res?.goodsInfoList[0]?.modifyUserId || '',
|
||||
resourceId: res?.goodsInfoList[0]?.resourceId || '',
|
||||
rule: res?.goodsInfoList[0]?.rule || '',
|
||||
settlementBasis: res?.goodsInfoList[0]?.settlementBasis || '',
|
||||
|
||||
}
|
||||
if(this.PageStatus === '整车修改' || this.PageStatus === '大宗修改') {
|
||||
this.sf4data.id = res?.goodsInfoList[0]?.id;
|
||||
}
|
||||
if(this.PageStatus === '大宗下一单' || this.PageStatus === '大宗修改') {
|
||||
this.totalFees = res?.freightPrice || '0';
|
||||
} else {
|
||||
this.totalFees = res?.shippingInformationVO?.totalFee || '0';
|
||||
}
|
||||
this.sf5data = {
|
||||
goodsValue: res?.goodsValue || '',
|
||||
}
|
||||
this.sf6data = {
|
||||
stateReceipt: res?.supplementaryInformationVO?.stateReceipt || '',
|
||||
remarks: res?.supplementaryInformationVO?.remarks || '',
|
||||
}
|
||||
this.sf7data = {
|
||||
prePay: res?.shippingInformationVO?.prePay || '',
|
||||
toPay: res?.shippingInformationVO?.toPay || '',
|
||||
oilCardPay: res?.shippingInformationVO?.oilCardPay || '',
|
||||
receiptPay: res?.shippingInformationVO?.receiptPay || '',
|
||||
// oilCardPay2: res?.shippingInformationVO?.oilCardPay || '',
|
||||
appendFee: res?.shippingInformationVO?.appendFee || '',
|
||||
paymentDays: res?.shippingInformationVO?.paymentDays || '',
|
||||
}
|
||||
if(this.PageStatus === '整车修改' || this.PageStatus === '大宗修改') {
|
||||
|
||||
}
|
||||
|
||||
// console.log(this.sf1.value)
|
||||
// console.log(this.startInfo)
|
||||
// console.log(this.endInfo)
|
||||
// console.log(this.validateForm1.value)
|
||||
// console.log(this.sf3.value)
|
||||
// console.log(this.sf4.value)
|
||||
// console.log(this.sf5.value)
|
||||
// console.log(this.sf6.value)
|
||||
}
|
||||
asds(i: any) {
|
||||
console.log(i)
|
||||
}
|
||||
// const data =
|
||||
}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/*
|
||||
* @Author: your name
|
||||
* @Date: 2021-12-03 11:10:14
|
||||
* @LastEditTime: 2021-12-08 14:35:47
|
||||
* @LastEditTime: 2021-12-09 20:54:28
|
||||
* @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\supply-management\components\vehicle-detail\vehicle-detail.component.ts
|
||||
@ -58,13 +58,17 @@ export class SupplyManagementVehicleDetailComponent implements OnInit {
|
||||
// 修改货源
|
||||
modification() {
|
||||
this.router.navigate(['/supply-management/vehicle-amend', this.id], {
|
||||
relativeTo: this.ar
|
||||
queryParams: {
|
||||
sta: 1
|
||||
},
|
||||
})
|
||||
}
|
||||
// 再下一单
|
||||
nextOrder() {
|
||||
this.router.navigate(['/supply-management/vehicle-amend', this.id], {
|
||||
relativeTo: this.ar
|
||||
queryParams: {
|
||||
sta: 2
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@ -445,7 +445,9 @@ export class SupplyManagementVehicleComponent implements OnInit {
|
||||
amend(item: any) {
|
||||
console.log(item)
|
||||
this.router.navigate(['/supply-management/vehicle-amend', item.id], {
|
||||
relativeTo: this.ar
|
||||
queryParams: {
|
||||
sta: 1
|
||||
},
|
||||
})
|
||||
}
|
||||
nextOrder(item: any) {
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/*
|
||||
* @Author: your name
|
||||
* @Date: 2021-12-03 11:10:14
|
||||
* @LastEditTime: 2021-12-09 10:56:28
|
||||
* @LastEditTime: 2021-12-09 21:13:41
|
||||
* @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\supply-management\services\supply-management.service.ts
|
||||
@ -25,6 +25,14 @@ export class SupplyManagementService extends BaseService {
|
||||
$api_set_saveAnotherWholeOrder = `/api/sdc/goodsResourceOperate/saveAnotherWholeOrder`;
|
||||
// 大宗再下一单
|
||||
$api_set_saveAnotherBulkOrder = `/api/sdc/goodsResourceOperate/saveAnotherBulkOrder`;
|
||||
// 编辑整车货源
|
||||
$api_set_WholeModify = `/api/sdc/goodsResourceOperate/updateWhole`;
|
||||
// 编辑大宗货源
|
||||
$api_set_bulkModify = `/api/sdc/goodsResourceOperate/updateBulk`;
|
||||
// 删除装卸货信息
|
||||
$api_delete_Wholedeletebatch = `/api/sdc/unLoadingPlace/deletebatch`;
|
||||
// 删除货物信息
|
||||
$api_delete_bulkdeletebatch = `/api/sdc/goodsInfo/deletebatch`;
|
||||
|
||||
constructor(public injector: Injector) {
|
||||
super(injector)
|
||||
|
||||
@ -10,24 +10,25 @@
|
||||
<sv-container col="3">
|
||||
<sv-title style="font-weight: 700;">车辆基础信息</sv-title>
|
||||
<sv label="车牌号">
|
||||
{{ detailData?.contactsName }}
|
||||
{{ detailData?.carNo }}
|
||||
</sv>
|
||||
<sv label="车牌颜色">
|
||||
{{ detailData?.contactsPhone }}
|
||||
{{ detailData?.carNoColor }}
|
||||
</sv>
|
||||
<sv label="车型">
|
||||
{{ detailData?.contactsPhone }}
|
||||
{{ detailData?.carModel }}
|
||||
</sv>
|
||||
<sv label="车长">
|
||||
{{ detailData?.contactsPhone }}
|
||||
{{ detailData?.carLength }}
|
||||
</sv>
|
||||
<sv label="是否为挂车">
|
||||
{{ detailData?.contactsPhone }}
|
||||
{{ detailData?.isTrailer === true ? '是' : '否'}}
|
||||
</sv>
|
||||
</sv-container>
|
||||
<sv-container col="1">
|
||||
<sv label="车头照">
|
||||
<!-- <app-imagelist [imgList]="detailData?.enterpriseQualificationCertificate"></app-imagelist> -->
|
||||
<span>{{detailData?.carFrontPhotoWatermark}}</span>
|
||||
<app-imagelist [imgList]="[detailData?.carFrontPhotoWatermark]"></app-imagelist>
|
||||
</sv>
|
||||
</sv-container>
|
||||
</ng-template>
|
||||
@ -106,17 +107,17 @@
|
||||
<sv-container col="2" class="mt16">
|
||||
<sv-title style="font-weight: 700;">认证司机</sv-title>
|
||||
</sv-container>
|
||||
<st
|
||||
<!-- <st
|
||||
#st
|
||||
[bordered]="true"
|
||||
[columns]="columns"
|
||||
[data]="detailData.goodsList"
|
||||
[data]="servi"
|
||||
[ngStyle]="{ margin: '1rem 0' }"
|
||||
multiSort
|
||||
size="small"
|
||||
[page]="{ show: false }"
|
||||
>
|
||||
</st>
|
||||
</st> -->
|
||||
</nz-card>
|
||||
</ng-container>
|
||||
|
||||
|
||||
@ -44,20 +44,7 @@ export class VehicleComponentsListDetailComponent implements OnInit {
|
||||
],
|
||||
},
|
||||
];
|
||||
detailData: any = {
|
||||
goodsList: [
|
||||
{
|
||||
perPrice: '22323',
|
||||
goodsQuantity: '项目名称',
|
||||
totalPrice: '角色',
|
||||
},
|
||||
{
|
||||
perPrice: '2259595',
|
||||
goodsQuantity: '项目名称2',
|
||||
totalPrice: '角色',
|
||||
},
|
||||
]
|
||||
};
|
||||
detailData: any;
|
||||
schema!: SFSchema;
|
||||
@ViewChild('sf', { static: false }) sf!: SFComponent;
|
||||
schema1!: SFSchema;
|
||||
@ -75,11 +62,9 @@ export class VehicleComponentsListDetailComponent implements OnInit {
|
||||
) {}
|
||||
|
||||
ngOnInit() {
|
||||
console.log(this.route.snapshot);
|
||||
// this.initData();
|
||||
this.initSF();
|
||||
this.initSF1();
|
||||
// this.launchSign();
|
||||
this.getDetailList();
|
||||
}
|
||||
/**
|
||||
* 初始化查询表单
|
||||
@ -141,45 +126,16 @@ export class VehicleComponentsListDetailComponent implements OnInit {
|
||||
required: this.validData,
|
||||
};
|
||||
}
|
||||
// async initData() {
|
||||
// console.log(this.route.snapshot, 'this.route.snapshot');
|
||||
|
||||
// const params = {
|
||||
// tenantId: this.route.snapshot.params.id,
|
||||
// // tenantId: this.route.snapshot.queryParams.tenantId,
|
||||
// };
|
||||
// const res = await this.service.asyncRequest(this.service.$api_get_supplier_info, params);
|
||||
// // // 商品资质
|
||||
// // if (res.enterpriseBusinessJson) {
|
||||
// // res.enterpriseBusinessJson.aptitudes = res.enterpriseBusinessJson?.aptitudes ? res.enterpriseBusinessJson.aptitudes.split(',') : [];
|
||||
// // }
|
||||
// // // // 申请人身份证证件
|
||||
// // // res.applyUserJson.imagelist = [];
|
||||
// // // res.applyUserJson.imagelist.push(res.applyUserJson.certificatePhotoFront);
|
||||
// // // res.applyUserJson.imagelist.push(res.applyUserJson.certificatePhotoBack);
|
||||
// // // res.applyUserJson.imagelist.push(res.applyUserJson.handCertificate);
|
||||
|
||||
// // 法人身份证证件
|
||||
// const imagelist = [];
|
||||
// imagelist.push(res?.certificatePhotoFront);
|
||||
// imagelist.push(res?.certificatePhotoBack);
|
||||
// res.certificatePhoto = imagelist;
|
||||
|
||||
// // 营业执照
|
||||
// res.enterpriseQualificationCertificate = res.enterpriseQualificationCertificate
|
||||
// ? res.enterpriseQualificationCertificate.split(',')
|
||||
// : [];
|
||||
|
||||
// // 返回所在地
|
||||
// res.enterpriseAddressCodeStr = await this.getRegionFullName(res.enterpriseAddressCode);
|
||||
|
||||
// this.detailData = res;
|
||||
// this.suppliersData = {
|
||||
// suppliersType: res?.suppliersType,
|
||||
// externalSuppliersId: res?.externalSuppliersId,
|
||||
// };
|
||||
// }
|
||||
|
||||
// 获取录单员
|
||||
getDetailList() {
|
||||
const params = {
|
||||
id: this.route.snapshot?.params?.id
|
||||
};
|
||||
this.service.request(`${this.service.$api_get_operate_get}`, params).subscribe((res) => {
|
||||
console.log(res)
|
||||
this.detailData = res;
|
||||
})
|
||||
}
|
||||
|
||||
goBack() {
|
||||
window.history.go(-1);
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<!--
|
||||
* @Author: your name
|
||||
* @Date: 2021-11-29 15:22:34
|
||||
* @LastEditTime: 2021-12-09 17:56:02
|
||||
* @LastEditTime: 2021-12-10 10:48:13
|
||||
* @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\usercenter\components\freight\list\list.component.html
|
||||
@ -59,14 +59,8 @@
|
||||
[loadingDelay]="500"
|
||||
[loading]="service.http.loading"
|
||||
>
|
||||
<ng-template st-row="enterpriseName" let-item let-index="index">
|
||||
<div nz-tooltip [nzTooltipTitle]="item.enterpriseName">
|
||||
<div
|
||||
style="display: inline-block; max-width: 280px; margin: 0 auto; overflow: hidden; white-space: nowrap; text-overflow: ellipsis"
|
||||
>
|
||||
{{ item.enterpriseName }}
|
||||
</div>
|
||||
</div>
|
||||
<ng-template st-row="carLength" let-item let-index="index">
|
||||
<div>{{item?.carModel}}-{{item?.carLength? item?.carLength + '米' : ''}}-{{ item?.carLoad? item?.carLoad + '吨' : ''}}</div>
|
||||
</ng-template>
|
||||
<ng-template st-row="contactsPhone" let-item let-index="index">
|
||||
<div
|
||||
|
||||
@ -15,34 +15,6 @@ export class VehicleComponentsListComponent implements OnInit {
|
||||
ui!: SFUISchema;
|
||||
schema!: SFSchema;
|
||||
columns!: STColumn[];
|
||||
datalist = [
|
||||
{
|
||||
storeName: '企业名称',
|
||||
contactsName: '152746565',
|
||||
enterpriseName: '湖南',
|
||||
unifiedSocialCreditCode: '45454',
|
||||
contactsPhone: '*97889461561',
|
||||
effectiveDateStr: '废弃eww',
|
||||
enStatusStr2: '正常',
|
||||
enStatusStr3: '正常',
|
||||
unifiedSocialCreditCode3: '常用服务',
|
||||
unifiedSocialCreditCode2: '正常',
|
||||
tenantId: 1
|
||||
},
|
||||
{
|
||||
storeName: '企业名称',
|
||||
contactsName: '152746565',
|
||||
enterpriseName: '湖南',
|
||||
unifiedSocialCreditCode: '45454',
|
||||
contactsPhone: '*97889461561',
|
||||
effectiveDateStr: '废弃eww',
|
||||
enStatusStr2: '正常',
|
||||
enStatusStr3: '正常',
|
||||
unifiedSocialCreditCode3: '常用服务',
|
||||
unifiedSocialCreditCode2: '正常',
|
||||
tenantId: 2
|
||||
},
|
||||
]
|
||||
@ViewChild('st', { static: false }) st!: STComponent;
|
||||
@ViewChild('sf', { static: false }) sf!: SFComponent;
|
||||
|
||||
@ -96,8 +68,8 @@ export class VehicleComponentsListComponent implements OnInit {
|
||||
hidden: true,
|
||||
},
|
||||
},
|
||||
storeName: { title: '车牌号', type: 'string', ui: { showRequired: false } },
|
||||
contactsName: {
|
||||
carNo: { title: '车牌号', type: 'string', ui: { showRequired: false } },
|
||||
carLength: {
|
||||
title: '车型车长载重',
|
||||
type: 'string',
|
||||
ui: {
|
||||
@ -119,7 +91,7 @@ export class VehicleComponentsListComponent implements OnInit {
|
||||
widget: 'select',
|
||||
},
|
||||
},
|
||||
enStatus12: {
|
||||
carNoColor: {
|
||||
type: 'string',
|
||||
title: '车牌颜色',
|
||||
enum: [
|
||||
@ -136,11 +108,10 @@ export class VehicleComponentsListComponent implements OnInit {
|
||||
},
|
||||
},
|
||||
},
|
||||
enStatus2: {
|
||||
isDriverLicenseExpire: {
|
||||
type: 'string',
|
||||
title: '到期状态',
|
||||
enum: [
|
||||
{ label: '全部', value: '' },
|
||||
{ label: '正常', value: 0 },
|
||||
{ label: '冻结', value: 1 },
|
||||
{ label: '废弃', value: 2 },
|
||||
@ -161,9 +132,9 @@ export class VehicleComponentsListComponent implements OnInit {
|
||||
initST() {
|
||||
this.columns = [
|
||||
// { title: '', type: 'checkbox', className: 'text-center' },
|
||||
{ title: '车牌号', className: 'text-center', index: 'storeName' },
|
||||
{ title: '车牌颜色', className: 'text-center', index: 'contactsName' },
|
||||
{ title: '车型-车长-载重', className: 'text-center', render: 'enterpriseName' },
|
||||
{ title: '车牌号', className: 'text-center', index: 'carNo' },
|
||||
{ title: '车牌颜色', className: 'text-center', index: 'carNoColor' },
|
||||
{ title: '车型-车长-载重', className: 'text-center', render: 'carLength' },
|
||||
{ title: '运营状态', className: 'text-center', index: 'effectiveDateStr',
|
||||
type: 'badge',
|
||||
badge: {
|
||||
@ -175,23 +146,21 @@ export class VehicleComponentsListComponent implements OnInit {
|
||||
{
|
||||
title: '行驶证到期状态',
|
||||
className: 'text-center',
|
||||
index: 'enStatusStr2',
|
||||
index: 'isDriverLicenseExpire',
|
||||
type: 'badge',
|
||||
badge: {
|
||||
正常: { text: '正常', color: 'success' },
|
||||
冻结: { text: '冻结', color: 'warning' },
|
||||
废弃: { text: '废弃', color: 'default' },
|
||||
false: { text: '否', color: 'success' },
|
||||
true: { text: '是', color: 'warning' },
|
||||
},
|
||||
},
|
||||
{
|
||||
title: '道运证到期状态',
|
||||
className: 'text-center',
|
||||
index: 'enStatusStr3',
|
||||
index: 'isRoadTransportExpire',
|
||||
type: 'badge',
|
||||
badge: {
|
||||
正常: { text: '正常', color: 'success' },
|
||||
冻结: { text: '冻结', color: 'warning' },
|
||||
废弃: { text: '废弃', color: 'default' },
|
||||
false: { text: '否', color: 'success' },
|
||||
true: { text: '是', color: 'warning' },
|
||||
},
|
||||
},
|
||||
{
|
||||
@ -202,7 +171,7 @@ export class VehicleComponentsListComponent implements OnInit {
|
||||
{
|
||||
text: '查看',
|
||||
click: (item) => {
|
||||
this.router.navigate(['./detail', item.tenantId], { relativeTo: this.ar });
|
||||
this.router.navigate(['./detail', item.id], { relativeTo: this.ar });
|
||||
// this.router.navigate(['./view', item.id], { relativeTo: this.ar, queryParams: { tenantId: item.tenantId } });
|
||||
},
|
||||
},
|
||||
@ -211,7 +180,7 @@ export class VehicleComponentsListComponent implements OnInit {
|
||||
];
|
||||
}
|
||||
daoyun(item: any) {
|
||||
this.router.navigate(['./view', item.tenantId], { relativeTo: this.ar });
|
||||
this.router.navigate(['./view', item.id], { relativeTo: this.ar });
|
||||
}
|
||||
expandToggle() {
|
||||
this._$expand = !this._$expand;
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/*
|
||||
* @Author: your name
|
||||
* @Date: 2021-11-29 15:22:34
|
||||
* @LastEditTime: 2021-12-09 17:55:37
|
||||
* @LastEditTime: 2021-12-10 10:51:34
|
||||
* @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\usercenter\services\usercenter.service.ts
|
||||
@ -18,6 +18,8 @@ import { EAFileUtil } from 'src/app/shared/utils/file.util';
|
||||
export class VehicleService extends BaseService {
|
||||
// 查询车辆认证表
|
||||
$api_get_operate_list = `/api/mdc/cuc/carLicense/operate/list/page`;
|
||||
// 获取车辆认证表
|
||||
$api_get_operate_get = `/api/mdc/cuc/carLicense/operate/get`;
|
||||
|
||||
constructor(public injector: Injector) {
|
||||
super(injector);
|
||||
|
||||
@ -1,3 +1,11 @@
|
||||
/*
|
||||
* @Author: your name
|
||||
* @Date: 2021-12-09 17:36:13
|
||||
* @LastEditTime: 2021-12-10 14:12:24
|
||||
* @LastEditors: Please set LastEditors
|
||||
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
||||
* @FilePath: \tms-obc-web\src\app\shared\components\imagelist\imagelist.component.ts
|
||||
*/
|
||||
import { Component, Input, OnInit } from '@angular/core';
|
||||
import { ModalHelper, _HttpClient } from '@delon/theme';
|
||||
import { NzMessageService } from 'ng-zorro-antd/message';
|
||||
@ -12,7 +20,9 @@ export class ImageListComponent implements OnInit {
|
||||
@Input() imgList: any = [];
|
||||
constructor(private modal: ModalHelper, public msgSrv: NzMessageService, public http: _HttpClient) {}
|
||||
|
||||
ngOnInit(): void {}
|
||||
ngOnInit(): void {
|
||||
console.log(this.imgList)
|
||||
}
|
||||
showImg(index: any) {
|
||||
const params = {
|
||||
imgList: this.imgList,
|
||||
|
||||
Reference in New Issue
Block a user