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-04-01 14:54:17 +08:00
parent 5c9f68c967 27b2048f03
commit 8e157193f0
7 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -25,6 +25,7 @@ scripts/var.less
# IDE - VSCode # IDE - VSCode
.vscode/* .vscode/*
.vscode
!.vscode/settings.json !.vscode/settings.json
!.vscode/tasks.json !.vscode/tasks.json
!.vscode/launch.json !.vscode/launch.json

2
.vscode/settings.json vendored
View File

@ -1,3 +1,3 @@
{ {
"compile-hero.disable-compile-files-on-did-save-code": false "compile-hero.disable-compile-files-on-did-save-code": true
} }

2
proxy.conf.js
View File

@ -20,7 +20,7 @@ module.exports = {
// } // }
'//api': { '//api': {
target: { target: {
host: 'tms-api-dev.eascs.com', host: 'tms-api-test.eascs.com',
protocol: 'https:', protocol: 'https:',
port: 443 port: 443
}, },

2
src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.html
View File

@ -9,7 +9,7 @@
<nz-card> <nz-card>
<nz-row [nzGutter]="16"> <nz-row [nzGutter]="16">
<nz-col [nzXl]="9" [nzLg]="8" [nzSm]="12"> <nz-col [nzXl]="9" [nzLg]="8" [nzSm]="12">
<nz-statistic [nzValue]="params?.ltdName+'('+(params?.bankType===1?'平安':'浦发')+')'" <nz-statistic [nzValue]="params?.ltdName+'('+(params?.bankType==='1'?'平安':'浦发')+')'"
[nzTitle]="params.name+'('+params.phone+')'" [nzValueStyle]="{'font-size':'16px','font-weight':'bold'}" [nzTitle]="params.name+'('+params.phone+')'" [nzValueStyle]="{'font-size':'16px','font-weight':'bold'}"
class="bold"> class="bold">
</nz-statistic> </nz-statistic>

2
src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.html
View File

@ -9,7 +9,7 @@
<nz-card> <nz-card>
<nz-row [nzGutter]="16"> <nz-row [nzGutter]="16">
<nz-col [nzXl]="9" [nzLg]="8" [nzSm]="12"> <nz-col [nzXl]="9" [nzLg]="8" [nzSm]="12">
<nz-statistic [nzValue]="params.ltdName+'('+(params.bankType===1?'平安':'浦发')+')'" <nz-statistic [nzValue]="params.ltdName+'('+(params.bankType==='1'?'平安':'浦发')+')'"
[nzTitle]="params.tenantName" [nzValueStyle]="{'font-size':'16px','font-weight':'bold'}" class="bold"> [nzTitle]="params.tenantName" [nzValueStyle]="{'font-size':'16px','font-weight':'bold'}" class="bold">
</nz-statistic> </nz-statistic>
</nz-col> </nz-col>

4
src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.html
View File

@ -1,4 +1,4 @@
<page-header-wrapper [title]="'开票订单明细'" [logo]="logo"> <page-header-wrapper [title]="'平台账户明细'" [logo]="logo">
<ng-template #logo> <ng-template #logo>
<button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()"> <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
<i nz-icon nzType="left" nzTheme="outline"></i> <i nz-icon nzType="left" nzTheme="outline"></i>
@ -7,7 +7,7 @@
</page-header-wrapper> </page-header-wrapper>
<nz-card> <nz-card>
<h3 class="font-weight-bold">天津怡亚通物流科技有限公司（浦发银行）</h3> <h3 class="font-weight-bold">{{params?.ltdName}}</h3>
<nz-row [nzGutter]="16"> <nz-row [nzGutter]="16">
<nz-col [nzXl]="4" [nzLg]="8" [nzSm]="12"> <nz-col [nzXl]="4" [nzLg]="8" [nzSm]="12">
<nz-statistic [nzValue]="((info.availableBalance |currency:' ') || 0)+'元'" nzTitle="平台账户余额" <nz-statistic [nzValue]="((info.availableBalance |currency:' ') || 0)+'元'" nzTitle="平台账户余额"

2
src/app/routes/financial-management/components/platform-account/platform-account.component.ts
View File

@ -187,7 +187,7 @@ export class PlatformAccountComponent implements OnInit {
text: '查看明细', text: '查看明细',
click: item => click: item =>
this.router.navigate(['/financial-management/platform-account/detail/' + item.id], { this.router.navigate(['/financial-management/platform-account/detail/' + item.id], {
queryParams: { ltdId: item.ltdId, bankType: item.bankType } queryParams: { ltdId: item.ltdId, bankType: item.bankType, ltdName: `${item.ltdName}(${item.bankTypeLabel})` }
}) })
} }
] ]