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-03-24 17:57:26 +08:00
parent 5cfe0ed512 4903a20abb
commit 85ed5e633e
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts
View File

@ -151,7 +151,7 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit {
* @param record 当前行 * @param record 当前行
*/ */
viewBookedRecord(record: any) { viewBookedRecord(record: any) {
window.open(location.origin + `#/partner/recorded/record?ltdId=${record?.ltdId}&userId=${record?.userId}&userIdLabel=${record?.banktypeLabel}`); window.open(location.origin + `#/partner/recorded/record?ltdId=${record?.ltdId}`);
} }
/** /**

2
src/app/routes/partner/recorded/components/record/record.component.ts
View File

@ -43,8 +43,6 @@ export class PartnerRecordedRecordComponent implements OnInit {
constructor(public service: RecordedService, private nzModalService: NzModalService, constructor(public service: RecordedService, private nzModalService: NzModalService,
private router: Router, public ar: ActivatedRoute, public shipperSrv: ShipperBaseService) { private router: Router, public ar: ActivatedRoute, public shipperSrv: ShipperBaseService) {
this.accountName = this.ar.snapshot.queryParams?.userIdLabel || '';
this.ltdId = this.ar.snapshot.queryParams?.ltdId || ''; this.ltdId = this.ar.snapshot.queryParams?.ltdId || '';
} }

6
src/app/routes/waybill-management/components/vehicle/vehicle.component.html
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-12-03 11:10:14 * @Date: 2021-12-03 11:10:14
* @LastEditTime : 2022-03-24 15:56:23 * @LastEditTime : 2022-03-24 17:32:49
* @LastEditors : Shiming * @LastEditors : Shiming
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\vehicle\\vehicle.component.html * @FilePath : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\vehicle\\vehicle.component.html
@ -77,8 +77,8 @@
<div> {{ item?.payeeName }}/{{ item?.payeePhone }} </div> <div> {{ item?.payeeName }}/{{ item?.payeePhone }} </div>
</ng-template> </ng-template>
<ng-template st-row="billExpenseDetailVOList2" let-item let-index="index"> <ng-template st-row="billExpenseDetailVOList2" let-item let-index="index">
<div *ngIf="item?.BillShipperWholeMyBidVO?.length > 0"> <div *ngIf="item?.mybidInfo?.length > 0">
<p *ngFor="let data of item?.BillShipperWholeMyBidVO"> {{ data?.costName }}：{{ data?.price | currency }} </p> <p *ngFor="let data of item?.mybidInfo"> {{ data?.expenseName }}：{{ data?.price | currency }} </p>
</div> </div>
</ng-template> </ng-template>
<ng-template st-row="billExpenseDetailVOList" let-item let-index="index"> <ng-template st-row="billExpenseDetailVOList" let-item let-index="index">