Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

This commit is contained in:
Taric Xin
2022-01-19 14:02:14 +08:00
6 changed files with 505 additions and 412 deletions

View File

@ -1,105 +1,167 @@
<page-header-wrapper title="费用单" [logo]="logo">
<ng-template #logo>
<button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
<i nz-icon nzType="left" nzTheme="outline"></i>
</button>
</ng-template>
<ng-template #logo>
<button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
<i nz-icon nzType="left" nzTheme="outline"></i>
</button>
</ng-template>
</page-header-wrapper>
<nz-card class="search-box">
<div nz-row>
<div nz-col nzSpan="24">
<se-container col="3" labelWidth=100 *ngIf="!textStatus">
<se-title class="mb-md" style="font-size:18px">基本信息(应收费用)</se-title>
<se label="网络货运人" required>
{{costInfo?.ltdid}}
</se>
<se label="费用类型" required col="2">
{{costInfo?.feetype}}
</se>
<se label="费用备注">
{{costInfo?.arremarks}}
</se>
<se label="应收对象" required>
{{costInfo?.artoname}}
</se>
<se label="开票类型" required>
{{costInfo?.arvattype}}
</se>
<se label="应收金额" required>
{{costInfo?.armoeny}}
</se>
<se label="开票金额" required>
{{costInfo?.arkpmoney}}
</se>
<se label="收款金额" required>
{{costInfo?.arbrmmoney}}
</se>
</se-container>
<se-container col="3" labelWidth=100 *ngIf="textStatus" class="mt-md">
<se-title class="mb-md" style="font-size:18px">基本信息(应付费用)</se-title>
<se label="网络货运人" required>
{{costInfo?.ltdid}}
</se>
<se label="费用类型" required>
{{costInfo?.feetype}}
</se>
<se label="应付核销" required>
</se>
<se label="费用备注">
{{costInfo?.hrremarks}}
</se>
<se label="应收对象" required>
{{costInfo?.hrtoname}}
</se>
<se label="收票类型" required>
{{costInfo?.hrvattype}}
</se>
<se label="应付金额" required>
{{costInfo?.hrmoney}}
</se>
<se label="收票金额" required>
{{costInfo?.hrvatmoney}}
</se>
<se label="付款金额" required>
{{costInfo?.hrpaymoney}}
</se>
</se-container>
</div>
<div nz-row>
<div nz-col nzSpan="24">
<se-container col="3" labelWidth="100" *ngIf="!textStatus">
<se-title class="mb-md" style="font-size: 18px">基本信息(应收费用)</se-title>
<se label="网络货运人" required>
{{ costInfo?.ltdid }}
</se>
<se label="费用类型" required col="2">
{{ costInfo?.feetype }}
</se>
<se label="费用备注">
{{ costInfo?.arremarks }}
</se>
<se label="应收对象" required>
{{ costInfo?.artoname }}
</se>
<se label="开票类型" required>
{{ costInfo?.arvattype }}
</se>
<se label="应收金额" required>
{{ costInfo?.armoeny }}
</se>
<se label="开票金额" required>
{{ costInfo?.arkpmoney }}
</se>
<se label="收款金额" required>
{{ costInfo?.arbrmmoney }}
</se>
</se-container>
<se-container col="3" labelWidth="100" *ngIf="textStatus" class="mt-md">
<se-title class="mb-md" style="font-size: 18px">基本信息(应付费用)</se-title>
<se label="网络货运人" required>
{{ costInfo?.ltdid }}
</se>
<se label="费用类型" required>
{{ costInfo?.feetype }}
</se>
<se label="应付核销" required> </se>
<se label="费用备注">
{{ costInfo?.hrremarks }}
</se>
<se label="应收对象" required>
{{ costInfo?.hrtoname }}
</se>
<se label="收票类型" required>
{{ costInfo?.hrvattype }}
</se>
<se label="应付金额" required>
{{ costInfo?.hrmoney }}
</se>
<se label="收票金额" required>
{{ costInfo?.hrvatmoney }}
</se>
<se label="付款金额" required>
{{ costInfo?.hrpaymoney }}
</se>
</se-container>
</div>
</div>
</nz-card>
<nz-card class="content-box" nzBordered>
<nz-tabset>
<nz-tab nzTitle="费用明细">
<st #st [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">
{{ index+1 }}
</ng-template>
</st>
</nz-tab>
<nz-tab nzTitle="开票信息">
<st #st [data]="costInfo?.ficoVatappDatailList" [columns]="columns.requested" [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-tab nzTitle="收款信息">
<st #st [data]="costInfo?.ficoAhxLList" [columns]="columns.collection" [page]="{ show: false}"
[loading]="service.http.loading" [scroll]="{ x:'1200px',y: '370px' }"></st>
</nz-tab>
<nz-tab nzTitle="收票信息">
<st #st [data]="data" [columns]="columns.ticket" [page]="{ show: false}" [loading]="service.http.loading"
[scroll]="{ x:'1200px',y: '370px' }"></st>
</nz-tab>
<nz-tab nzTitle="付款信息">
<st #st [data]="costInfo?.ficoPhxLList" [columns]="columns.payment" [page]="{ show: false}" [loading]="service.http.loading"
[scroll]="{ x:'1200px',y: '370px' }"></st>
</nz-tab>
</nz-tabset>
</nz-card>
<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="hrvatmoney" let-item let-index="index">
{{ item.hrvatmoney | currency}}
</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>
</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>
<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>
<ng-template st-row="no" let-item let-index="index" let-column="column">
{{ index + 1 }}
</ng-template>
<ng-template st-row="status" let-item let-index="index" let-column="column"> 已核销 </ng-template>
</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>
</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' }"
>
<ng-template st-row="no" let-item let-index="index" let-column="column">
{{ index + 1 }}
</ng-template>
</st>
</nz-tab>
</nz-tabset>
</nz-card>

View File

@ -43,42 +43,42 @@ export class CostManagementDetailComponent implements OnInit {
private initST(): { [key: string]: STColumn[] } {
return {
cost: [
{ title: '序号', render: 'no', width: 70 },
{ title: '费用明细号', index: 'feeHId' },
{ title: '订单号', index: 'billHId' },
{ title: '订单日期', index: 'callNo' },
{ title: '运单号', index: 'waybillHId' },
{ title: '运单日期', index: 'waybillDate' },
{ title: '结算客户', index: 'callNo' },
{ title: '订单费用类型', index: 'billLType' },
{ title: '费用科目', index: 'feeSubId' },
{ title: '税率', index: 'hrvatrate' },
{ title: '费用金额', index: 'hrvatmoney' },
{ title: '收/付款金额', index: 'armoney' },
{ title: '开/收票金额', index: 'arkpmoney' }
{ title: '序号', render: 'no', width: 70,className: 'text-left', },
{ title: '费用明细号', index: 'feeHId',className: 'text-left', width: 200,},
{ title: '订单号', index: 'billHId' ,className: 'text-left', width: 200,},
{ title: '订单日期', index: 'callNo' ,className: 'text-left',width: 200,},
{ title: '运单号', index: 'waybillHId',className: 'text-left', width: 200,},
{ title: '运单日期', index: 'waybillDate' ,className: 'text-left',width: 200,},
{ title: '结算客户', index: 'callNo' ,className: 'text-left',width: 200,},
{ title: '订单费用类型', index: 'billLType' ,className: 'text-left',width: 200,},
{ title: '费用科目', index: 'feeSubId' ,className: 'text-left',width: 200,},
{ title: '税率', index: 'hrvatrate',className: 'text-right', width: 200,},
{ title: '费用金额', render: 'hrvatmoney',className: 'text-right', width: 200,},
{ title: '收/付款金额', render: 'armoney',className: 'text-right', width: 200,},
{ title: '开/收票金额', render: 'arkpmoney' ,className: 'text-right',width: 200,}
],
requested: [
{ title: '序号', render: 'no', width: 70 },
{ title: '费用明细号', index: 'feeHId' },
{ title: '发票申请', index: 'vatappcode' },
{ title: '发票类型', index: 'vatapptype' },
{ title: '发票号', index: 'vatappcode' },
{ title: '发票日期', index: 'vatappdate' },
{ title: '发票状态', index: 'sts' },
{ title: '应收金额', index: 'vatnotax' },
{ title: '开票金额', index: 'vatmoney' }
{ title: '序号', render: 'no', width: 70 ,className: 'text-left',},
{ title: '费用明细号', index: 'feeHId',className: 'text-left',width: 200, },
{ title: '发票申请', index: 'vatappcode',className: 'text-left', width: 200,},
{ title: '发票类型', index: 'vatapptype',className: 'text-left',width: 200, },
{ title: '发票号', index: 'vatappcode',className: 'text-left',width: 200, },
{ title: '发票日期', index: 'vatappdate',className: 'text-left', width: 200,},
{ title: '发票状态', index: 'sts' ,className: 'text-left',width: 200,},
{ title: '应收金额', render: 'vatnotax',className: 'text-left',width: 200, },
{ title: '开票金额', render: 'vatmoney' ,className: 'text-left',width: 200,}
],
collection: [
{ title: '序号', index: 'no' },
{ title: '费用明细号', index: 'waybillLId' },
{ title: '收款单号', index: 'callNo' },
{ title: '收款日期', index: 'callNo' },
{ title: '收款状态', index: 'callNo' },
{ title: '应收金额', index: 'callNo' },
{ title: '收款金额', index: 'callNo' }
{ title: '序号', render: 'no', width: 70, },
{ title: '费用明细号', index: 'feeLId' ,className: 'text-left', width: 200,},
{ title: '收款单号', index: 'ahxHId' ,className: 'text-left', width: 200,},
{ title: '收款日期', index: 'feedate' ,className: 'text-left', width: 200,},
{ title: '收款状态', render: 'status' ,className: 'text-left', width: 150,},
{ title: '应收金额', render: 'ahxmoney' ,className: 'text-left', width: 120,},
{ title: '收款金额', render: 'ahxmoney',className: 'text-left', width: 120, }
],
ticket: [
{ title: '序号', index: 'no' },
{ title: '序号', render: 'no', width: 70 },
{ title: '费用明细号', index: 'callNo' },
{ title: '进项发票号', index: 'callNo' },
{ title: '发票类型', index: 'callNo' },
@ -89,7 +89,7 @@ export class CostManagementDetailComponent implements OnInit {
{ title: '收票金额', index: 'callNo' }
],
payment: [
{ title: '序号', index: 'no' },
{ title: '序号', render: 'no', width: 70 },
{ title: '费用明细号', index: 'callNo' },
{ title: '付款单号', index: 'callNo' },
{ title: '要求日期', index: 'callNo' },

View File

@ -1,51 +1,95 @@
<page-header-wrapper title="费用管理">
</page-header-wrapper>
<!--
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-30 19:36:30
* @LastEditors : Shiming
* @LastEditTime : 2022-01-19 13:49:42
* @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\cost-management\\cost-management.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<page-header-wrapper title="费用管理"> </page-header-wrapper>
<nz-card class="search-box">
<div nz-row nzGutter="8">
<div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
<sf #sf [schema]="searchSchema"
[ui]="{ '*': { spanLabelFixed: 110,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}" [compact]="true"
[button]="'none'"></sf>
</div>
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
<button nz-button (click)="resetSF()">重置</button>
<button nz-button (click)="exportList()"> 导出</button>
<button nz-button (click)="exportList()"> 导出明细</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
</button>
</div>
<div nz-row nzGutter="8">
<div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
<sf
#sf
[schema]="searchSchema"
[ui]="{ '*': { spanLabelFixed: 110, grid: { lg: 8, md: 12, sm: 12, xs: 24 } } }"
[compact]="true"
[button]="'none'"
></sf>
</div>
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
<button nz-button (click)="resetSF()">重置</button>
<button nz-button (click)="exportList()"> 导出</button>
<button nz-button (click)="exportList()"> 导出明细</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
</button>
</div>
</div>
</nz-card>
<nz-card class="content-box">
<div nz-row class="mb-sm">
<div nz-col nzSpan="24">
<button nz-button nzType="primary" [nzLoading]="service.http.loading"
(click)="routeTo('/financial-management/cost-management/expenses-receivable/1')">添加应收费用</button>
<button nz-button nzType="primary" [nzLoading]="service.http.loading"
(click)="routeTo('/financial-management/cost-management/expenses-payable/1')">添加应付费用</button>
<button nz-button nzType="primary" [nzLoading]="service.http.loading">导入费用</button>
</div>
<div nz-row class="mb-sm">
<div nz-col nzSpan="24">
<button
nz-button
nzType="primary"
[nzLoading]="service.http.loading"
(click)="routeTo('/financial-management/cost-management/expenses-receivable/1')"
>添加应收费用</button
>
<button
nz-button
nzType="primary"
[nzLoading]="service.http.loading"
(click)="routeTo('/financial-management/cost-management/expenses-payable/1')"
>添加应付费用</button
>
<button nz-button nzType="primary" [nzLoading]="service.http.loading">导入费用</button>
</div>
<st #st [data]="service.$api_get_cost_page" [columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
[loading]="service.http.loading" [scroll]="{ y: '370px' }">
</st>
</div>
<st
#st
[data]="service.$api_get_cost_page"
[columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
[loading]="service.http.loading"
[scroll]="{ x: '2000px' }"
>
<ng-template st-row="armoeny" let-item let-index="index">
{{ item.armoeny | currency}}
</ng-template>
<ng-template st-row="hrmoney" let-item let-index="index">
{{ item.hrmoney | currency}}
</ng-template>
<ng-template st-row="hrpaymoney" let-item let-index="index">
{{ item.hrpaymoney | currency}}
</ng-template>
<ng-template st-row="hrvatmoney" let-item let-index="index">
{{ item.hrvatmoney | currency}}
</ng-template>
</st>
</nz-card>
<ng-template #auditModal>
<div nz-row nzGutter="8">
<div nz-col nzSpan="24" se-container [labelWidth]="80">
<se [col]="1" label="备注">
<textarea nz-input rows="3" placeholder="同意可以不用填写原因 ,拒绝必须说明原因"
style="width: 325px;margin-left: 14px;"></textarea>
</se>
</div>
<div nz-row nzGutter="8">
<div nz-col nzSpan="24" se-container [labelWidth]="80">
<se [col]="1" label="备注">
<textarea
nz-input
rows="3"
placeholder="同意可以不用填写原因 ,拒绝必须说明原因"
style="width: 325px; margin-left: 14px"
></textarea>
</se>
</div>
</ng-template>
</div>
</ng-template>

View File

@ -248,22 +248,22 @@ export class CostManagementComponent implements OnInit {
private initST(): STColumn[] {
return [
{ title: '费用单号', index: 'feecode', width: 120 },
{ title: '网络货运人', index: 'ltdId', width: 120 },
{ title: '订单号', index: 'billHId', width: 120 },
{ title: '运单号', index: 'waybillHId', width: 120 },
{ title: '费用日期', index: 'feedate', width: 150 },
{ title: '费用类型', index: 'feetypeLabel', width: 100 },
{ title: '应付核销', index: 'ishrhx', width: 100, type: 'enum', enum: { 0: '否', 1: '是' } },
{ title: '结算客户', index: 'cno', width: 100 },
{ title: '应收对象', index: 'artoname', width: 100 },
{ title: '应付对象', index: 'hrtoname', width: 100 },
{ title: '应收金额', index: 'armoeny', width: 100 },
{ title: '应付金额', index: 'hrmoney', width: 100 },
{ title: '收/付款金额', index: 'hrpaymoney', width: 120 },
{ title: '开/收票金额', index: 'hrvatmoney', width: 120 },
{ title: '创建时间', index: 'auditTime', type: 'date', width: 150 },
{ title: '状态', index: 'stsLabel', width: 90 },
{ title: '费用单号', fixed: 'left', index: 'feecode', width: 200 ,className: 'text-left',},
{ title: '网络货运人', index: 'ltdId', width: 200 ,className: 'text-left',},
{ title: '订单号', index: 'billHId', width: 200,className: 'text-left', },
{ title: '运单号', index: 'waybillHId', width: 200 ,className: 'text-left',},
{ title: '费用日期', index: 'feedate', width: 200 ,className: 'text-left',},
{ title: '费用类型', index: 'feetypeLabel', width: 150,className: 'text-left', },
{ title: '应付核销', index: 'ishrhx', width: 200, type: 'enum', enum: { 0: '否', 1: '是' } ,className: 'text-left',},
{ title: '结算客户', index: 'cno', width: 200 ,className: 'text-left',},
{ title: '应收对象', index: 'artoname', width: 200 ,className: 'text-left',},
{ title: '应付对象', index: 'hrtoname', width: 200 ,className: 'text-left',},
{ title: '应收金额', render: 'armoeny', width: 100 ,className: 'text-left',},
{ title: '应付金额', render: 'hrmoney', width: 100 ,className: 'text-left',},
{ title: '收/付款金额', render: 'hrpaymoney', width: 120 ,className: 'text-left',},
{ title: '开/收票金额', render: 'hrvatmoney', width: 120 ,className: 'text-left',},
{ title: '创建时间', index: 'auditTime', type: 'date', width: 200 ,className: 'text-left',},
{ title: '状态', index: 'stsLabel', width: 90 ,className: 'text-left',},
{
title: '操作',
fixed: 'right',