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-02-28 11:33:52 +08:00
parent dbb52f85bf 2b013e0e48
commit e9c75fdba6
19 changed files with 110 additions and 136 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">
<div nz-row>
<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 label="网络货运人" required>
{{ costInfo?.ltdName }}
@ -27,13 +27,13 @@
{{ costInfo?.arvattypeLabel }}
</se>
<se label="应收金额" required>
{{ costInfo?.armoeny }}
{{ costInfo?.armoeny | currency }}
</se>
<se label="开票金额" required>
{{ costInfo?.arkpmoney }}
{{ costInfo?.arkpmoney | currency }}
</se>
<se label="收款金额" required>
{{ costInfo?.armoeny }}
{{ costInfo?.armoeny | currency }}
</se>
</se-container>
<se-container col="3" labelWidth="100" *ngIf="textStatus" class="mt-md">
@ -44,7 +44,7 @@
<se label="费用类型" required>
{{ costInfo?.feetypeLabel }}
</se>
<se label="应付核销" required> </se>
<se label="应付核销" required> {{ costInfo?.hrmoney}}</se>
<se label="费用备注">
{{ costInfo?.hrremarks }}
</se>
@ -55,13 +55,13 @@
{{ costInfo?.hrvattypeLabel }}
</se>
<se label="应付金额" required>
{{ costInfo?.hrmoney }}
{{ costInfo?.hrmoney | currency}}
</se>
<se label="收票金额" required>
{{ costInfo?.hrvatmoney }}
{{ (costInfo?.hrvatmoney || 0) | currency }}
</se>
<se label="付款金额" required>
{{ costInfo?.hrpaymoney }}
{{ costInfo?.hrpaymoney | currency }}
</se>
</se-container>
</div>
@ -71,31 +71,27 @@
<nz-card class="content-box" nzBordered>
<nz-tabset>
<nz-tab nzTitle="费用明细">
<st
#st
[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>
<st #st [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="no" let-item let-index="index" let-column="column">
{{ textStatus ? item.hrmoney : item.hrvatmoney }}
{{ index + 1 }}
</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">
{{costInfo.billTime}}
</ng-template>
@ -105,42 +101,28 @@
</st>
</nz-tab>
<nz-tab nzTitle="开票信息">
<st
#st
[scroll]="{ x: '2000px' }"
[data]="costInfo?.ficoVatappDatailList"
[columns]="columns.requested"
[page]="{ show: false }"
[loading]="service.http.loading"
[scroll]="{ x: '1200px', y: '370px' }"
>
<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>
<st #st [scroll]="{ x: '2000px' }" [data]="costInfo?.ficoVatappDatailList" [columns]="columns.requested"
[page]="{ show: false }" [loading]="service.http.loading" [scroll]="{ x: '1200px', y: '370px' }">
<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">
{{ index + 1 }}
</ng-template>
</st>
</nz-tab>
<nz-tab nzTitle="收款信息">
<st
#st
[scroll]="{ x: '2000px' }"
[data]="costInfo?.ficoAhxLList"
[columns]="columns.collection"
[page]="{ show: false }"
[loading]="service.http.loading"
[scroll]="{ x: '1200px', y: '370px' }"
>
<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>
<st #st [scroll]="{ x: '2000px' }" [data]="costInfo?.ficoAhxLList" [columns]="columns.collection"
[page]="{ show: false }" [loading]="service.http.loading" [scroll]="{ x: '1200px', y: '370px' }">
<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">
{{ index + 1 }}
</ng-template>
@ -148,30 +130,16 @@
</st>
</nz-tab>
<nz-tab nzTitle="收票信息">
<st
#st
[data]="data"
[scroll]="{ x: '2000px' }"
[columns]="columns.ticket"
[page]="{ show: false }"
[loading]="service.http.loading"
[scroll]="{ x: '1200px', y: '370px' }"
></st>
<st #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 nzTitle="付款信息">
<st
#st
[scroll]="{ x: '2000px' }"
[data]="costInfo?.ficoPhxLList"
[columns]="columns.payment"
[page]="{ show: false }"
[loading]="service.http.loading"
[scroll]="{ x: '1200px', y: '370px' }"
>
<nz-tab nzTitle="付款信息" *ngIf="textStatus">
<st #st [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">
{{ index + 1 }}
</ng-template>
</st>
</nz-tab>
</nz-tabset>
</nz-card>
</nz-card>

2
src/app/routes/financial-management/components/payable-order/payable-order-detail/payable-order-detail.component.html
View File

@ -40,7 +40,7 @@
{{headerInfo?.driver2IdName}}
</se>
<se label="收款账户" required>
{{headerInfo?.ltdaccount}}
{{headerInfo?.ltdaccountId}}
</se>
<se label="应付金额">
{{headerInfo?.prmoney | currency}}

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

@ -16,9 +16,9 @@
</ng-template>
</page-header-wrapper>
<nz-card>
<nz-card [nzLoading]="service.http.loading">
<nz-alert nzType="info" nzMessage="提现信息" class="mb-md"></nz-alert>
<div se-container [labelWidth]="100">
<div se-container [labelWidth]="130">
<se label="网络货运人">
{{formData?.ltdName}}
</se>
@ -41,7 +41,7 @@
{{formData?.refundStatusLabel}}
</se>
<se label="提现金额">
{{formData?.amount}}
{{formData?.amount | currency}}
</se>
<se label="银行流水号">
{{formData?.bankSerialNumber}}
@ -50,7 +50,7 @@
{{formData?.bankId}}
</se>
<se label="银行回单" col="1">
<img [src]="formData?.bankCardNumber" alt="" style="width: 200px;height: 160px;">
<a (click)="downBack()">{{formData?.refundStatus==='3'?'下载回单':'暂无回单'}}</a>
</se>
</div>

13
src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts
View File

@ -67,6 +67,19 @@ export class WithdrawalsDetailComponent implements OnInit {
});
}
downBack() {
if (this.formData?.refundStatus !== '3') {
return;
}
this.service.getReceiptUrl(this.formData.receiptUrl, {
bankType: this.formData.bankType,
rmYll: this.formData.userId,
snglFlgCd: this.formData.coreSerNo,
bussType: '06',
ltdId: this.formData.ltdId
});
}
goBack() {
history.go(-1);
}

29
src/app/routes/sys-setting/components/role-management/menu/menu.less
View File

@ -174,6 +174,21 @@ li {
list-style : none;
}
.dictData {
dl {
margin : 0;
padding: 0;
}
dt {
margin : 0 0 5px 0;
padding : 3px 0;
color : #999;
font-weight : normal;
font-size : 13px;
border-bottom: solid 1px #eee;
}
}
label {
color : #666;
@ -185,18 +200,12 @@ label {
width : 700px;
.leftBox {
width : 250px;
border : 1px solid #d1d1d1;
max-height: 500px;
overflow : auto;
width : 40%;
// border-right: solid 1px #eee;
}
.rightBox {
flex : 1;
margin : 0 0 0 20px;
padding-left: 12px;
border : 1px solid #d1d1d1;
max-height : 500px;
overflow : auto;
width : 60%;
padding: 0 0 0 20px;
}
}

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

@ -45,7 +45,7 @@
</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"
(change)="stChange($event)">
<ng-template st-row="vatinvcode" let-item let-index="index" let-column="column">

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

@ -353,7 +353,7 @@ export class CancellationInvoiceComponent implements OnInit {
},
{ title: '服务名称', index: 'vatname', width: 100 },
{ title: '销货清单', index: 'isdetail', width: 90, type: 'enum', enum: { 1: '是', 0: '否' }, className: 'text-center' },
{ title: '票面备注', render: 'vatremarks', width: 250 },
{ title: '票面备注', index: 'remarks', width: 250 },
{ title: '其他要求', index: 'otherremarks', width: 100 },
{
title: '操作',

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

@ -19,7 +19,7 @@
{{info?.artoacc}}
</se>
<se label="票面备注">
{{info?.vatremarks}}
{{info?.remarks}}
</se>
</div>
<div nz-col nzSpan="12" se-container [labelWidth]="100" col="1">

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

@ -14,22 +14,6 @@ export class PushInvoiceComponent implements OnInit {
@ViewChild('st', { static: false })
st!: STComponent;
columns: STColumn[] = this.initST();
data = [
{
key: 0,
disabled: true,
href: 'https://ant.design',
avatar: 'https://gw.alipayobjects.com/zos/rmsportal/eeHMaZBwmTvLdIwMfBpg.png',
no: 'TradeCode 0'
},
{
key: 1,
disabled: false,
href: 'https://ant.design',
avatar: 'https://gw.alipayobjects.com/zos/rmsportal/udxAbMEhpwthVVcjLXik.png',
no: 'TradeCode 1'
}
];
info: any = {};
id!: number;

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

@ -32,5 +32,5 @@
</div>
</div>
<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>

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>
<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">
{{item.driverName}}<br>{{item.driverTelephone}}
</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 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' }">
<ng-template st-row="call3No" let-item let-index="index" let-column="column">
{{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>
<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)">
<ng-template st-row="call1No" let-item let-index="index" let-column="column">
{{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">
<button nz-button nzType="primary" (click)="printOrder()">打印面单</button>
</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>
</nz-card>

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

@ -32,7 +32,7 @@
</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)">
</st>
</nz-card>

10
src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts
View File

@ -289,12 +289,12 @@ export class InvoiceRequestedDetailComponent implements OnInit {
{ title: '订单类型', index: 'billType', width: 100, type: 'enum', enum: { 1: '整车', 2: '大宗' } },
{ title: '装货地', index: 'loadingfrom', width: 220 },
{ title: '卸货地', index: 'loadingto', width: 220 },
{ title: '货物信息', index: 'goodsinfo', width: 100 },
{ title: '货物信息', index: 'goodsinfo', width: 150 },
{ title: '承运司机', index: 'driverinfo', width: 140 },
{
title: '申请金额',
index: 'billkpmoney',
width: 100,
width: 150,
type: 'widget',
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.billkpmoney }) }
@ -302,7 +302,7 @@ export class InvoiceRequestedDetailComponent implements OnInit {
{
title: '运输费',
index: 'fjfmoney2',
width: 90,
width: 150,
type: 'widget',
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.fjfmoney2 }) }
@ -310,7 +310,7 @@ export class InvoiceRequestedDetailComponent implements OnInit {
{
title: '附加费',
index: 'fjfmoney',
width: 90,
width: 150,
type: 'widget',
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.fjfmoney }) }
@ -318,7 +318,7 @@ export class InvoiceRequestedDetailComponent implements OnInit {
{
title: '开票金额',
index: 'billkpmoney',
width: 100,
width: 150,
type: 'widget',
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.billkpmoney }) }

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

@ -53,7 +53,7 @@
</ng-template>
<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)">
<ng-template st-row="vatappcode" let-item let-index="index" let-column="column">
{{ item.vatappcode }} <br />

16
src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts
View File

@ -343,14 +343,14 @@ export class InvoiceRequestedComponent implements OnInit {
private initST(): STColumn[] {
return [
{ title: '', index: 'key', type: 'checkbox' },
{ title: '申请编号', render: 'vatappcode', width: 180 },
{ title: '网络货运人', index: 'ltdName', width: 150 },
{ title: '购买方', index: 'artoName', width: 150 },
{ title: '申请编号', render: 'vatappcode', width: 190 },
{ title: '网络货运人', index: 'ltdName', width: 170 },
{ title: '购买方', index: 'artoName', width: 170 },
{ title: '订单数', index: 'ordlines', width: 90 },
{
title: '申请金额',
index: 'applyAmount',
width: 140,
width: 150,
type: 'widget',
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.applyAmount }) }
@ -358,7 +358,7 @@ export class InvoiceRequestedComponent implements OnInit {
{
title: '运输费',
index: 'fjfmoney2',
width: 140,
width: 150,
type: 'widget',
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.fjfmoney2 }) }
@ -366,7 +366,7 @@ export class InvoiceRequestedComponent implements OnInit {
{
title: '附加费',
index: 'fjfmoney',
width: 140,
width: 150,
type: 'widget',
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.fjfmoney }) }
@ -374,7 +374,7 @@ export class InvoiceRequestedComponent implements OnInit {
{
title: '已开票金额',
index: 'invoicedMoney',
width: 140,
width: 150,
type: 'widget',
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.invoicedMoney }) }
@ -382,7 +382,7 @@ export class InvoiceRequestedComponent implements OnInit {
{ title: '开户行', index: 'bankName', width: 160 },
{ title: '银行账户', index: 'bankAccount', width: 140 },
{ title: '注册地址', index: 'registerAddr', width: 140 },
{ title: '注册电话', index: 'registerPhone', width: 120 },
{ title: '注册电话', index: 'registerPhone', width: 130 },
{ title: '服务名称', index: 'vatnameLabel', width: 150 },
{
title: '销货清单',

2
src/styles.less
View File

@ -20,7 +20,7 @@
}
}
@layout-gutter: 8px;
@layout-gutter: 11px;
/* 全局滚动条美化 */
*::-webkit-scrollbar {