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:
wangshiming
2022-03-11 11:01:49 +08:00
parent b0de026701 2d98e91e02
commit a719dfd6dc
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts
View File

@ -372,7 +372,7 @@ export class CancellationInvoiceComponent implements OnInit {
text: '查看明细', text: '查看明细',
click: item => click: item =>
this.router.navigate(['ticket/cancellation-invoice/detail/' + item.id], { this.router.navigate(['ticket/cancellation-invoice/detail/' + item.id], {
queryParams: { type: 1, expressno: item.expressno, ltdId: item.ltdId } queryParams: { type: 1, expressno: item.expressno, ltdId: item.shipperId }
}) })
}, },
{ {

2
src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts
View File

@ -249,7 +249,7 @@ export class InvoicedListComponent implements OnInit {
text: '查看明细', text: '查看明细',
click: item => click: item =>
this.router.navigate(['/ticket/invoice-list/detail/' + item.id], { this.router.navigate(['/ticket/invoice-list/detail/' + item.id], {
queryParams: { expressno: item.expressno, type: 2, ltdId: item.ltdId } queryParams: { expressno: item.expressno, type: 2, ltdId: item.shipperId }
}) })
}, },
{ {

6
src/app/shared/services/business/shipper-base.service.ts
View File

@ -49,9 +49,9 @@ export class ShipperBaseService extends BaseService {
* @returns * @returns
*/ */
getEnterpriseProject(params?: any) { getEnterpriseProject(params?: any) {
if (this.list.length > 0) { // if (this.list.length > 0) {
return of(this.list); // return of(this.list);
} // }
return this.request(this.$api_get_enterprise_project, params).pipe( return this.request(this.$api_get_enterprise_project, params).pipe(
map((res: any) => { map((res: any) => {
if (!res) { if (!res) {