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

fix style

Browse Source
This commit is contained in:
Lingzi
2022-03-07 20:28:44 +08:00
parent 9b7b07397b 9894aafcc1
commit 07589c8452
43 changed files with 540 additions and 972 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-24 16:58:02
* @LastEditors : Shiming
* @LastEditTime : 2022-03-04 14:15:24
* @LastEditTime : 2022-03-07 17:32:05
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -201,8 +201,6 @@
</form>
</nz-card>
<nz-card nzTitle="基本信息" #distannce2>
<div nz-row>
<div nz-col nzSpan="12">
<sf #sf3 [schema]="schema3" [formData]="sf3data" [button]="'none'" [ui]="ui3"></sf>
<sf #sf4 [schema]="schema4" [formData]="sf4data" [button]="'none'" [ui]="ui4">
<ng-template sf-template="weight" let-item let-ui="ui">
@ -256,9 +254,6 @@
</ng-template>
</sf>
</div>
</div>
</nz-card>
<nz-card nzTitle="运费信息"#distannce3>

9
src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-24 16:58:02
* @LastEditors : Shiming
* @LastEditTime : 2022-03-04 14:15:21
* @LastEditTime : 2022-03-07 17:56:10
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -90,6 +90,7 @@ loadTime: any; // 货源单设置回显
public shipperservice: ShipperBaseService,
fb: FormBuilder,
private envSrv: EAEnvironmentService,
private ar: ActivatedRoute,
) {
this.validateForm1 = fb.group({
loadTime: [null, []],
@ -495,7 +496,7 @@ loadTime: any; // 货源单设置回显
this.service.request(this.service.$api_set_modifyBulkOrder, params).subscribe((res: any) => {
if(res) {
this.service.msgSrv.success('修改成功！');
this.router.navigate(['/order-management/bulk']);
this.router.navigate(['/order-management/bulk/bulk-detail/', this.id]);
} else {
this.service.msgSrv.error(res?.msg);
}
@ -623,7 +624,7 @@ loadTime: any; // 货源单设置回显
};
this.ui3 = {
'*': {
spanLabelFixed: 90,
spanLabelFixed: 110,
grid: { span: 12 }
}
};
@ -767,7 +768,7 @@ initSF4() {
};
this.ui4 = {
'*': {
spanLabelFixed: 90,
spanLabelFixed: 110,
grid: { span: 24 }
},
$weight: {

20
src/app/routes/order-management/components/bulk/bulk.component.ts
View File

@ -456,15 +456,21 @@ export class OrderManagementBulkComponent implements OnInit {
},
{
title: '接单数量',
className: 'text-right',
index: 'goodsNumber',
width: '180px'
render: 'receveOrderCountInfo',
width: '170px',
className: 'text-left',
format: (item: any) =>
`${item.acceptWeight || '--'}吨/
${item.acceptVolume || '--'}方`
},
{
title: '结算重量',
className: 'text-right',
index: 'settlementWeight',
width: '150px'
title: '结算数量',
index: '结算数量',
width: '170px',
className: 'text-left',
format: (item: any) =>
`${item.settlementWeight || '--'}吨/
${item.settlementVolume || '--'}方`
},
{
title: '承运司机',

6
src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-23 13:39:58
* @LastEditors : Shiming
* @LastEditTime : 2022-03-04 10:42:33
* @LastEditTime : 2022-03-07 17:29:44
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail-change\\vehicle-detail-change.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -169,8 +169,6 @@
</form>
</nz-card>
<nz-card nzTitle="基本信息" configuration #distannce2>
<div nz-row>
<div nz-col nzSpan="12">
<sf #sf3 [schema]="schema3" [formData]="sf3data" [button]="'none'" [ui]="ui3"></sf>
<sf #sf4 [schema]="schema4" [formData]="sf4data" [button]="'none'" [ui]="ui4">
<ng-template sf-template="weight" let-item let-ui="ui">
@ -232,8 +230,6 @@
<nz-date-picker nzShowTime nzFormat="yyyy-MM-dd HH:mm:ss" [(ngModel)]="unloadTime"></nz-date-picker>
</ng-template>
</sf>
</div>
</div>
</nz-card>
<nz-card nzTitle="运费信息" #distannce3>

13
src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-23 13:39:58
* @LastEditors : Shiming
* @LastEditTime : 2022-03-04 10:48:50
* @LastEditTime : 2022-03-07 17:56:51
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail-change\\vehicle-detail-change.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -98,6 +98,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
private modalService: NzModalService,
private amapService: AmapService,
public shipperservice: ShipperBaseService,
private ar: ActivatedRoute,
fb: FormBuilder,
private envSrv: EAEnvironmentService
) {
@ -545,7 +546,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
console.log(res);
if (res) {
this.service.msgSrv.success('修改成功！');
this.router.navigate(['/order-management/vehicle']);
this.router.navigate(['/order-management/vehicle/vehicle-detail/', this.id], { relativeTo: this.ar });
} else {
this.service.msgSrv.error(res?.msg);
}
@ -678,12 +679,6 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
spanLabelFixed: 110,
grid: { span: 12 }
},
$goodsName: {
grid: { span: 12 }
},
$qita: {
grid: { span: 12 }
}
};
}
changeGoodsType(value: string, data: any) {
@ -785,7 +780,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
};
this.ui4 = {
'*': {
spanLabelFixed: 90,
spanLabelFixed: 110,
grid: { span: 24 }
},
$weight: {