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

edit

Browse Source
This commit is contained in:
Taric Xin
2022-02-28 11:27:33 +08:00
parent 17357934fb
commit 2b013e0e48
10 changed files with 59 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

130
src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.html
View File

@ -9,7 +9,7 @@
<nz-card class="search-box"> <nz-card class="search-box">
<div nz-row> <div nz-row>
<div nz-col nzSpan="24"> <div nz-col nzSpan="24">
<se-container col="3" labelWidth="100" *ngIf="!textStatus"> <se-container col="3" labelWidth="120" *ngIf="!textStatus">
<se-title class="mb-md" style="font-size: 18px">基本信息（应收费用）</se-title> <se-title class="mb-md" style="font-size: 18px">基本信息（应收费用）</se-title>
<se label="网络货运人" required> <se label="网络货运人" required>
{{ costInfo?.ltdName }} {{ costInfo?.ltdName }}
@ -27,13 +27,13 @@
{{ costInfo?.arvattypeLabel }} {{ costInfo?.arvattypeLabel }}
</se> </se>
<se label="应收金额" required> <se label="应收金额" required>
{{ costInfo?.armoeny }} {{ costInfo?.armoeny | currency }}
</se> </se>
<se label="开票金额" required> <se label="开票金额" required>
{{ costInfo?.arkpmoney }} {{ costInfo?.arkpmoney | currency }}
</se> </se>
<se label="收款金额" required> <se label="收款金额" required>
{{ costInfo?.armoeny }} {{ costInfo?.armoeny | currency }}
</se> </se>
</se-container> </se-container>
<se-container col="3" labelWidth="100" *ngIf="textStatus" class="mt-md"> <se-container col="3" labelWidth="100" *ngIf="textStatus" class="mt-md">
@ -44,7 +44,7 @@
<se label="费用类型" required> <se label="费用类型" required>
{{ costInfo?.feetypeLabel }} {{ costInfo?.feetypeLabel }}
</se> </se>
<se label="应付核销" required> </se> <se label="应付核销" required> {{ costInfo?.hrmoney}}</se>
<se label="费用备注"> <se label="费用备注">
{{ costInfo?.hrremarks }} {{ costInfo?.hrremarks }}
</se> </se>
@ -55,13 +55,13 @@
{{ costInfo?.hrvattypeLabel }} {{ costInfo?.hrvattypeLabel }}
</se> </se>
<se label="应付金额" required> <se label="应付金额" required>
{{ costInfo?.hrmoney }} {{ costInfo?.hrmoney | currency}}
</se> </se>
<se label="收票金额" required> <se label="收票金额" required>
{{ costInfo?.hrvatmoney }} {{ (costInfo?.hrvatmoney || 0) | currency }}
</se> </se>
<se label="付款金额" required> <se label="付款金额" required>
{{ costInfo?.hrpaymoney }} {{ costInfo?.hrpaymoney | currency }}
</se> </se>
</se-container> </se-container>
</div> </div>
@ -71,31 +71,27 @@
<nz-card class="content-box" nzBordered> <nz-card class="content-box" nzBordered>
<nz-tabset> <nz-tabset>
<nz-tab nzTitle="费用明细"> <nz-tab nzTitle="费用明细">
<st <st #st [scroll]="{ x: '2000px' }" [data]="costInfo?.ficoFeeLList" [columns]="columns.cost"
#st [page]="{ show: false }" [loading]="service.http.loading" [scroll]="{ x: '1200px', y: '370px' }">
[scroll]="{ x: '2000px' }"
[data]="costInfo?.ficoFeeLList"
[columns]="columns.cost"
[page]="{ show: false }"
[loading]="service.http.loading"
[scroll]="{ x: '1200px', y: '370px' }"
>
<ng-template st-row="artocode" let-item let-index="index">
{{ costInfo?.artocode}}/{{ costInfo?.artonames}}
</ng-template>
<ng-template st-row="hrvatmoney" let-item let-index="index">
<span *ngIf="!textStatus">{{ item.armoney | currency}}</span>
<span *ngIf="textStatus">{{ item.hrmoney | currency}}</span>
</ng-template>
<ng-template st-row="armoney" let-item let-index="index">
{{ item.armoney | currency}}
</ng-template>
<ng-template st-row="arkpmoney" let-item let-index="index">
{{ item.arkpmoney | currency}}
</ng-template>
<ng-template st-row="no" let-item let-index="index" let-column="column"> <ng-template st-row="no" let-item let-index="index" let-column="column">
{{ textStatus ? item.hrmoney : item.hrvatmoney }} {{ index + 1 }}
</ng-template> </ng-template>
<ng-template st-row="artocode" let-item let-index="index">
{{ costInfo?.artocode}}/{{ costInfo?.artonames}}
</ng-template>
<ng-template st-row="hrvatmoney" let-item let-index="index">
<span *ngIf="!textStatus">{{ item.armoney | currency}}</span>
<span *ngIf="textStatus">{{ item.hrmoney | currency}}</span>
</ng-template>
<ng-template st-row="armoney" let-item let-index="index">
{{ item.armoney | currency}}
</ng-template>
<ng-template st-row="arkpmoney" let-item let-index="index">
{{ item.arkpmoney | currency}}
</ng-template>
<!-- <ng-template st-row="no" let-item let-index="index" let-column="column">
{{ textStatus ? item.hrmoney : item.hrvatmoney }}
</ng-template> -->
<ng-template st-row="billTime" let-item let-index="index" let-column="column"> <ng-template st-row="billTime" let-item let-index="index" let-column="column">
{{costInfo.billTime}} {{costInfo.billTime}}
</ng-template> </ng-template>
@ -105,42 +101,28 @@
</st> </st>
</nz-tab> </nz-tab>
<nz-tab nzTitle="开票信息"> <nz-tab nzTitle="开票信息">
<st <st #st [scroll]="{ x: '2000px' }" [data]="costInfo?.ficoVatappDatailList" [columns]="columns.requested"
#st [page]="{ show: false }" [loading]="service.http.loading" [scroll]="{ x: '1200px', y: '370px' }">
[scroll]="{ x: '2000px' }" <ng-template st-row="vatnotax" let-item let-index="index">
[data]="costInfo?.ficoVatappDatailList" {{ item.vatnotax | currency}}
[columns]="columns.requested" </ng-template>
[page]="{ show: false }" <ng-template st-row="vatmoney" let-item let-index="index">
[loading]="service.http.loading" {{ item.vatmoney | currency}}
[scroll]="{ x: '1200px', y: '370px' }" </ng-template>
>
<ng-template st-row="vatnotax" let-item let-index="index">
{{ item.vatnotax | currency}}
</ng-template>
<ng-template st-row="vatmoney" let-item let-index="index">
{{ item.vatmoney | currency}}
</ng-template>
<ng-template st-row="no" let-item let-index="index" let-column="column"> <ng-template st-row="no" let-item let-index="index" let-column="column">
{{ index + 1 }} {{ index + 1 }}
</ng-template> </ng-template>
</st> </st>
</nz-tab> </nz-tab>
<nz-tab nzTitle="收款信息"> <nz-tab nzTitle="收款信息">
<st <st #st [scroll]="{ x: '2000px' }" [data]="costInfo?.ficoAhxLList" [columns]="columns.collection"
#st [page]="{ show: false }" [loading]="service.http.loading" [scroll]="{ x: '1200px', y: '370px' }">
[scroll]="{ x: '2000px' }" <ng-template st-row="ahxmoney" let-item let-index="index">
[data]="costInfo?.ficoAhxLList" {{ item.ahxmoney | currency}}
[columns]="columns.collection" </ng-template>
[page]="{ show: false }" <ng-template st-row="ahxmoney" let-item let-index="index">
[loading]="service.http.loading" {{ item.ahxmoney | currency}}
[scroll]="{ x: '1200px', y: '370px' }" </ng-template>
>
<ng-template st-row="ahxmoney" let-item let-index="index">
{{ item.ahxmoney | currency}}
</ng-template>
<ng-template st-row="ahxmoney" let-item let-index="index">
{{ item.ahxmoney | currency}}
</ng-template>
<ng-template st-row="no" let-item let-index="index" let-column="column"> <ng-template st-row="no" let-item let-index="index" let-column="column">
{{ index + 1 }} {{ index + 1 }}
</ng-template> </ng-template>
@ -148,30 +130,16 @@
</st> </st>
</nz-tab> </nz-tab>
<nz-tab nzTitle="收票信息"> <nz-tab nzTitle="收票信息">
<st <st #st [data]="data" [scroll]="{ x: '2000px' }" [columns]="columns.ticket" [page]="{ show: false }"
#st [loading]="service.http.loading" [scroll]="{ x: '1200px', y: '370px' }"></st>
[data]="data"
[scroll]="{ x: '2000px' }"
[columns]="columns.ticket"
[page]="{ show: false }"
[loading]="service.http.loading"
[scroll]="{ x: '1200px', y: '370px' }"
></st>
</nz-tab> </nz-tab>
<nz-tab nzTitle="付款信息"> <nz-tab nzTitle="付款信息" *ngIf="textStatus">
<st <st #st [scroll]="{ x: '2000px' }" [data]="costInfo?.ficoPhxLList" [columns]="columns.payment"
#st [page]="{ show: false }" [loading]="service.http.loading" [scroll]="{ x: '1200px', y: '370px' }">
[scroll]="{ x: '2000px' }"
[data]="costInfo?.ficoPhxLList"
[columns]="columns.payment"
[page]="{ show: false }"
[loading]="service.http.loading"
[scroll]="{ x: '1200px', y: '370px' }"
>
<ng-template st-row="no" let-item let-index="index" let-column="column"> <ng-template st-row="no" let-item let-index="index" let-column="column">
{{ index + 1 }} {{ index + 1 }}
</ng-template> </ng-template>
</st> </st>
</nz-tab> </nz-tab>
</nz-tabset> </nz-tabset>
</nz-card> </nz-card>

4
src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html
View File

@ -18,7 +18,7 @@
<nz-card [nzLoading]="service.http.loading"> <nz-card [nzLoading]="service.http.loading">
<nz-alert nzType="info" nzMessage="提现信息" class="mb-md"></nz-alert> <nz-alert nzType="info" nzMessage="提现信息" class="mb-md"></nz-alert>
<div se-container [labelWidth]="100"> <div se-container [labelWidth]="130">
<se label="网络货运人"> <se label="网络货运人">
{{formData?.ltdName}} {{formData?.ltdName}}
</se> </se>
@ -41,7 +41,7 @@
{{formData?.refundStatusLabel}} {{formData?.refundStatusLabel}}
</se> </se>
<se label="提现金额"> <se label="提现金额">
{{formData?.amount}} {{formData?.amount | currency}}
</se> </se>
<se label="银行流水号"> <se label="银行流水号">
{{formData?.bankSerialNumber}} {{formData?.bankSerialNumber}}

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

@ -45,7 +45,7 @@
</ng-template> </ng-template>
<st #st [scroll]="{ x: '2000px' }" [data]="service.$api_ficoVatinvHList" [columns]="columns" <st #st [scroll]="{ x: '2000px' }" [data]="service.$api_ficoVatinvHList" [columns]="columns" [page]="{}"
[req]="{process: beforeReq }" [res]="{process:afterRes }" [loading]="service.http.loading" [req]="{process: beforeReq }" [res]="{process:afterRes }" [loading]="service.http.loading"
(change)="stChange($event)"> (change)="stChange($event)">
<ng-template st-row="vatinvcode" let-item let-index="index" let-column="column"> <ng-template st-row="vatinvcode" let-item let-index="index" let-column="column">

2
src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.html
View File

@ -32,5 +32,5 @@
</div> </div>
</div> </div>
<st #st [data]="tabType===1?service.$api_get_etc_shipper_list:service.$api_get_etc_cart_page" [columns]="columns" <st #st [data]="tabType===1?service.$api_get_etc_shipper_list:service.$api_get_etc_cart_page" [columns]="columns"
[req]="{ process: beforeReq }" [loading]="service.http.loading" (change)="stChange($event)"></st> [page]="{}" [req]="{ process: beforeReq }" [loading]="service.http.loading" (change)="stChange($event)"></st>
</nz-card> </nz-card>

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

@ -23,7 +23,7 @@
<nz-card class="content-box" nzBordered> <nz-card class="content-box" nzBordered>
<st #st [data]="service.$api_get_invoice_record_page" [columns]="columns" [req]="{ process: beforeReq }" <st #st [data]="service.$api_get_invoice_record_page" [columns]="columns" [req]="{ process: beforeReq }"
[loading]="service.http.loading" [scroll]="{ x:'1200px' }"> [page]="{}" [loading]="service.http.loading" [scroll]="{ x:'1200px' }">
<ng-template st-row="call1No" let-item let-index="index" let-column="column"> <ng-template st-row="call1No" let-item let-index="index" let-column="column">
{{item.driverName}}<br>{{item.driverTelephone}} {{item.driverName}}<br>{{item.driverTelephone}}
</ng-template> </ng-template>

2
src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.html
View File

@ -23,7 +23,7 @@
</nz-card> </nz-card>
<nz-card class="content-box" nzBordered> <nz-card class="content-box" nzBordered>
<st #st [data]="service.$api_get_invoice_logs_page" [columns]="columns" [req]="{ process: beforeReq }" <st #st [data]="service.$api_get_invoice_logs_page" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}"
[loading]="service.http.loading" [scroll]="{ x:'1200px' }"> [loading]="service.http.loading" [scroll]="{ x:'1200px' }">
<ng-template st-row="call3No" let-item let-index="index" let-column="column"> <ng-template st-row="call3No" let-item let-index="index" let-column="column">
{{item.driverName}}<br>{{item.driverCellphone}} {{item.driverName}}<br>{{item.driverCellphone}}

2
src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.html
View File

@ -32,7 +32,7 @@
</div> </div>
</div> </div>
<st #st [data]="service.$api_get_apply_invoice_page" [columns]="columns" [req]="{ process: beforeReq }" <st #st [data]="service.$api_get_apply_invoice_page" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}"
[loading]="service.http.loading" [scroll]="{ x:'1200px' }" (change)="stChange($event)"> [loading]="service.http.loading" [scroll]="{ x:'1200px' }" (change)="stChange($event)">
<ng-template st-row="call1No" let-item let-index="index" let-column="column"> <ng-template st-row="call1No" let-item let-index="index" let-column="column">
{{item.driverName}}<br>{{item.driverTelephone}} {{item.driverName}}<br>{{item.driverTelephone}}

2
src/app/routes/ticket-management/components/express-info/express-info.component.html
View File

@ -19,6 +19,6 @@
<div class="mt-md mb-sm"> <div class="mt-md mb-sm">
<button nz-button nzType="primary" (click)="printOrder()">打印面单</button> <button nz-button nzType="primary" (click)="printOrder()">打印面单</button>
</div> </div>
<st #st [data]="url" [columns]="columns" [req]="{ process:beforeReq }" [loading]="service.http.loading" <st #st [data]="url" [columns]="columns" [req]="{ process:beforeReq }" [loading]="service.http.loading" [page]="{}"
(change)="stChange($event)"></st> (change)="stChange($event)"></st>
</nz-card> </nz-card>

2
src/app/routes/ticket-management/components/input-invoice/input-invoice.component.html
View File

@ -32,7 +32,7 @@
</div> </div>
</div> </div>
<st #st [data]="service.$api_get_input_invoice_page" [columns]="columns" [req]="{ process: beforeReq }" <st #st [data]="service.$api_get_input_invoice_page" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}"
[loading]="service.http.loading" [scroll]="{ x:'1200px' }" (change)="stChange($event)"> [loading]="service.http.loading" [scroll]="{ x:'1200px' }" (change)="stChange($event)">
</st> </st>
</nz-card> </nz-card>

2
src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html
View File

@ -53,7 +53,7 @@
</ng-template> </ng-template>
<st #st [data]="service.$api_get_invoice_requested_page" [columns]="columns" [req]="{ process: beforeReq }" <st #st [data]="service.$api_get_invoice_requested_page" [columns]="columns" [req]="{ process: beforeReq }"
[res]="{ process: afterRes }" [loading]="service.http.loading" [scroll]="{ x: '1200px' }" [page]="{}" [res]="{ process: afterRes }" [loading]="service.http.loading" [scroll]="{ x: '1200px' }"
(change)="stChange($event)"> (change)="stChange($event)">
<ng-template st-row="vatappcode" let-item let-index="index" let-column="column"> <ng-template st-row="vatappcode" let-item let-index="index" let-column="column">
{{ item.vatappcode }} <br /> {{ item.vatappcode }} <br />