diff --git a/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.html b/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.html index fb07af22..8b315a1f 100644 --- a/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.html +++ b/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.html @@ -9,7 +9,7 @@
- + 基本信息(应收费用) {{ costInfo?.ltdName }} @@ -27,13 +27,13 @@ {{ costInfo?.arvattypeLabel }} - {{ costInfo?.armoeny }} + {{ costInfo?.armoeny | currency }} - {{ costInfo?.arkpmoney }} + {{ costInfo?.arkpmoney | currency }} - {{ costInfo?.armoeny }} + {{ costInfo?.armoeny | currency }} @@ -44,7 +44,7 @@ {{ costInfo?.feetypeLabel }} - + {{ costInfo?.hrmoney}} {{ costInfo?.hrremarks }} @@ -55,13 +55,13 @@ {{ costInfo?.hrvattypeLabel }} - {{ costInfo?.hrmoney }} + {{ costInfo?.hrmoney | currency}} - {{ costInfo?.hrvatmoney }} + {{ (costInfo?.hrvatmoney || 0) | currency }} - {{ costInfo?.hrpaymoney }} + {{ costInfo?.hrpaymoney | currency }}
@@ -71,31 +71,27 @@ - - - {{ costInfo?.artocode}}/{{ costInfo?.artonames}} - - - {{ item.armoney | currency}} - {{ item.hrmoney | currency}} - - - {{ item.armoney | currency}} - - - {{ item.arkpmoney | currency}} - + - {{ textStatus ? item.hrmoney : item.hrvatmoney }} + {{ index + 1 }} + + {{ costInfo?.artocode}}/{{ costInfo?.artonames}} + + + {{ item.armoney | currency}} + {{ item.hrmoney | currency}} + + + {{ item.armoney | currency}} + + + {{ item.arkpmoney | currency}} + + {{costInfo.billTime}} @@ -105,42 +101,28 @@ - - - {{ item.vatnotax | currency}} - - - {{ item.vatmoney | currency}} - + + + {{ item.vatnotax | currency}} + + + {{ item.vatmoney | currency}} + {{ index + 1 }} - - - {{ item.ahxmoney | currency}} - - - {{ item.ahxmoney | currency}} - + + + {{ item.ahxmoney | currency}} + + + {{ item.ahxmoney | currency}} + {{ index + 1 }} @@ -148,30 +130,16 @@ - + - - + + {{ index + 1 }} - + \ No newline at end of file diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html index 6fca6da3..27916f8e 100644 --- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html +++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html @@ -18,7 +18,7 @@ -
+
{{formData?.ltdName}} @@ -41,7 +41,7 @@ {{formData?.refundStatusLabel}} - {{formData?.amount}} + {{formData?.amount | currency}} {{formData?.bankSerialNumber}} diff --git a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html index 460bd272..32244510 100644 --- a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html +++ b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html @@ -45,7 +45,7 @@ - diff --git a/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.html b/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.html index 175cf98e..c0bf7776 100644 --- a/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.html +++ b/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.html @@ -32,5 +32,5 @@
+ [page]="{}" [req]="{ process: beforeReq }" [loading]="service.http.loading" (change)="stChange($event)">
\ No newline at end of file diff --git a/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.html b/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.html index 92b7deda..256f65cf 100644 --- a/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.html +++ b/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.html @@ -23,7 +23,7 @@ + [page]="{}" [loading]="service.http.loading" [scroll]="{ x:'1200px' }"> {{item.driverName}}
{{item.driverTelephone}}
diff --git a/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.html b/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.html index e51410c7..327ca6d3 100644 --- a/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.html +++ b/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.html @@ -23,7 +23,7 @@
- {{item.driverName}}
{{item.driverCellphone}} diff --git a/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.html b/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.html index c70109db..53afff60 100644 --- a/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.html +++ b/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.html @@ -32,7 +32,7 @@
- {{item.driverName}}
{{item.driverTelephone}} diff --git a/src/app/routes/ticket-management/components/express-info/express-info.component.html b/src/app/routes/ticket-management/components/express-info/express-info.component.html index 10d768d1..bb175e73 100644 --- a/src/app/routes/ticket-management/components/express-info/express-info.component.html +++ b/src/app/routes/ticket-management/components/express-info/express-info.component.html @@ -19,6 +19,6 @@
-
\ No newline at end of file diff --git a/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.html b/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.html index 0e667010..b1049186 100644 --- a/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.html +++ b/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.html @@ -32,7 +32,7 @@ - \ No newline at end of file diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html index 08f30dea..9ec28409 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html @@ -53,7 +53,7 @@ {{ item.vatappcode }}