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',

View File

@ -11,7 +11,6 @@ import { of } from 'rxjs';
import { ShipperBaseService } from '@shared';
import { Router } from '@angular/router';
@Component({
selector: 'app-supply-management-bulk',
templateUrl: './bulk.component.html',
@ -27,10 +26,10 @@ export class OrderManagementBulkComponent implements OnInit {
isVisibleEvaluate = false;
isVisible = false;
_$expand = false;
changeId: any; // 主页面查看运费变更记录id - 用于运费变更记录
changeViewId: any; // 查看运费变更记录id - 用于查看
ViewCause: any; // 变更运费查看数据
sfViewFormData: any; // 变更运费查看的sf 数据
changeId: any; // 主页面查看运费变更记录id - 用于运费变更记录
changeViewId: any; // 查看运费变更记录id - 用于查看
ViewCause: any; // 变更运费查看数据
sfViewFormData: any; // 变更运费查看的sf 数据
@ViewChild('st') private readonly st!: STComponent;
@ViewChild('stFloat') private readonly stFloat!: STComponent;
@ViewChild('stFloatView') private readonly stFloatView!: STComponent;
@ -44,56 +43,55 @@ export class OrderManagementBulkComponent implements OnInit {
resourceStatus: any;
datass: any = [
{
one: '1',
two: '1',
three: '1',
id: 1
},
one: '1',
two: '1',
three: '1',
id: 1
},
{
one: '2',
two: '2',
three: '2',
id: 2
},
];
tabs = {
cancelQuantity: 0,
receivedQuantity: 0,
stayQuantity: 0,
signQuantity: 0,
compolatelQuantity: 0,
GoingQuantity: 0,
totalCount: 0
};
one: '2',
two: '2',
three: '2',
id: 2
}
];
tabs = {
cancelQuantity: 0,
receivedQuantity: 0,
stayQuantity: 0,
signQuantity: 0,
compolatelQuantity: 0,
GoingQuantity: 0,
totalCount: 0
};
constructor(
public service: OrderManagementService,
private modal: NzModalService,
public shipperservice: ShipperBaseService,
private router: Router,
) { }
private router: Router
) {}
/**
* 查询参数
*/
get reqParams() {
const a:any = {};
if(this.resourceStatus) {
* 查询参数
*/
get reqParams() {
const a: any = {};
if (this.resourceStatus) {
a.billStatus = this.resourceStatus;
}
const params: any = Object.assign({}, this.sf?.value || {});
delete params._$expand;
return {
return {
...a,
...params,
createTime: {
start: this.sf?.value?.createTime?.[0] || '',
end: this.sf?.value?.createTime?.[1] || '',
},
};
end: this.sf?.value?.createTime?.[1] || ''
}
};
}
get selectedRows() {
return this.st?.list.filter((item) => item.checked) || [];
return this.st?.list.filter(item => item.checked) || [];
}
get changeParams() {
return {
@ -102,7 +100,7 @@ tabs = {
}
search() {
this.st?.load(1);
this.getGoodsSourceStatistical()
this.getGoodsSourceStatistical();
}
getGoodsSourceStatistical() {
this.tabs = {
@ -114,39 +112,39 @@ tabs = {
GoingQuantity: 0,
totalCount: 0
};
this.service.request(this.service.$api_getBulkStatistical, {...this.reqParams}).subscribe(res => {
this.service.request(this.service.$api_getBulkStatistical, { ...this.reqParams }).subscribe(res => {
if (res) {
let totalCount = 0;
res.forEach((element: any) => {
if(element.billStatusLabel === '待发车') {
this.tabs.stayQuantity = element.quantity
} else if (element.billStatusLabel === '待接单') {
this.tabs.receivedQuantity = element.quantity
} else if (element.billStatusLabel === '待签收') {
this.tabs.signQuantity = element.quantity
} else if (element.billStatusLabel === '已完成') {
this.tabs.compolatelQuantity = element.quantity
} else if (element.billStatusLabel === '已取消') {
this.tabs.cancelQuantity = element.quantity
} else if (element.billStatusLabel === '运输中') {
this.tabs.GoingQuantity = element.quantity
}
totalCount += element.quantity
});
this.tabs.totalCount = totalCount
res.forEach((element: any) => {
if (element.billStatusLabel === '待发车') {
this.tabs.stayQuantity = element.quantity;
} else if (element.billStatusLabel === '待接单') {
this.tabs.receivedQuantity = element.quantity;
} else if (element.billStatusLabel === '待签收') {
this.tabs.signQuantity = element.quantity;
} else if (element.billStatusLabel === '已完成') {
this.tabs.compolatelQuantity = element.quantity;
} else if (element.billStatusLabel === '已取消') {
this.tabs.cancelQuantity = element.quantity;
} else if (element.billStatusLabel === '运输中') {
this.tabs.GoingQuantity = element.quantity;
}
totalCount += element.quantity;
});
this.tabs.totalCount = totalCount;
}
})
});
}
selectChange(e: number) {
this.resourceStatus = e;
this.initST();
setTimeout(() => {
this.st.load();
this.getGoodsSourceStatistical()
this.getGoodsSourceStatistical();
}, 500);
}
ngOnInit(): void {
this.getGoodsSourceStatistical()
this.getGoodsSourceStatistical();
this.initSF();
this.initST();
this.initSTFloat();
@ -154,11 +152,9 @@ tabs = {
this.initSFView();
}
/**
* 初始化查询表单
*/
* 初始化查询表单
*/
initSF() {
this.schema = {
properties: {
@ -183,14 +179,14 @@ tabs = {
onSearch: (q: any) => {
if (!!q) {
return this.service
.request(this.service.$api_enterpriceList, { enterpriseName: q})
.pipe(map((res: any) => (res as any[]).map((i) => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum))))
.request(this.service.$api_enterpriceList, { enterpriseName: q })
.pipe(map((res: any) => (res as any[]).map(i => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum))))
.toPromise();
} else {
return of([]);
}
},
} as SFSelectWidgetSchema,
}
} as SFSelectWidgetSchema
},
enterpriseProjectId: {
type: 'string',
@ -247,10 +243,10 @@ tabs = {
type: 'string',
ui: {
visibleIf: {
_$expand: (value: boolean) => value,
},
_$expand: (value: boolean) => value
}
}
},
},
paymentstatus: {
title: '支付状态',
type: 'string',
@ -259,9 +255,9 @@ tabs = {
params: { dictKey: 'overall:payment:status' },
containsAllLable: true,
visibleIf: {
_$expand: (value: boolean) => value,
},
} as SFSelectWidgetSchema,
_$expand: (value: boolean) => value
}
} as SFSelectWidgetSchema
},
createTime: {
title: '创建时间',
@ -288,9 +284,9 @@ tabs = {
widget: 'select',
placeholder: '请选择',
visibleIf: {
_$expand: (value: boolean) => value,
},
},
_$expand: (value: boolean) => value
}
}
},
enterpriseInfoId: {
type: 'string',
@ -300,10 +296,10 @@ tabs = {
placeholder: '请选择',
allowClear: true,
visibleIf: {
_$expand: (value: boolean) => value,
_$expand: (value: boolean) => value
},
asyncData: () => this.shipperservice.getNetworkFreightForwarder(),
},
asyncData: () => this.shipperservice.getNetworkFreightForwarder()
}
},
serviceType: {
title: '服务类型',
@ -314,9 +310,9 @@ tabs = {
params: { dictKey: 'service:type' },
containsAllLable: true,
visibleIf: {
_$expand: (value: boolean) => value,
},
} as SFSelectWidgetSchema,
_$expand: (value: boolean) => value
}
} as SFSelectWidgetSchema
},
settlementBasis: {
title: '结算依据',
@ -325,26 +321,26 @@ tabs = {
widget: 'dict-select',
containsAllLable: true,
params: { dictKey: 'goodresource:settlement:type' },
containAllLable:true,
containAllLable: true,
visibleIf: {
_$expand: (value: boolean) => value,
},
} as SFSelectWidgetSchema,
},
_$expand: (value: boolean) => value
}
} as SFSelectWidgetSchema
}
},
type: 'object'
};
this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
}
/**
* 初始化查询表单
*/
* 初始化查询表单
*/
initSFView() {
this.schemaView = {
properties: {
freightPrice: {
type: 'string',
title: '运费单价',
title: '运费单价'
},
rule: {
title: '',
@ -353,9 +349,9 @@ tabs = {
widget: 'dict-select',
params: { dictKey: 'goodresource:rounding:rules' },
visibleIf: {
_$expand: (value: boolean) => value,
},
} as SFSelectWidgetSchema,
_$expand: (value: boolean) => value
}
} as SFSelectWidgetSchema
},
settlementBasis: {
type: 'string',
@ -364,11 +360,11 @@ tabs = {
widget: 'dict-select',
params: { dictKey: 'goodresource:settlement:type' },
visibleIf: {
_$expand: (value: boolean) => value,
},
} as SFSelectWidgetSchema,
},
},
_$expand: (value: boolean) => value
}
} as SFSelectWidgetSchema
}
}
};
this.uiView = { '*': { spanLabelFixed: 80, grid: { span: 12, gutter: 4 } } };
}
@ -378,7 +374,7 @@ tabs = {
*/
initST() {
this.columns = [
{ title: '', type: 'checkbox', fixed: 'left', width: '50px', className: 'text-center' },
{ title: '', type: 'checkbox', fixed: 'left', width: '50px', className: 'text-center' },
{
title: '订单号',
width: '180px',
@ -390,7 +386,7 @@ tabs = {
title: '运费明细',
width: '250px',
className: 'text-right',
render: 'mybidDetailInfo',
render: 'mybidDetailInfo'
},
{ title: '网络货运人', index: 'enterpriseInfoName', width: '220px', className: 'text-left' },
{ title: '货主', index: 'shipperAppUserName', width: '220px', className: 'text-left' },
@ -409,7 +405,8 @@ tabs = {
className: 'text-left',
width: '250px',
render: 'goodsName'
}, {
},
{
title: '运费单价',
className: 'text-right',
width: '180px',
@ -419,13 +416,13 @@ tabs = {
title: '接单数量',
className: 'text-right',
index: 'goodsNumber',
width: '180px',
width: '180px'
},
{
title: '结算重量',
className: 'text-right',
index: 'settlementWeight',
width: '150px',
width: '150px'
},
{
title: '承运司机',
@ -439,7 +436,7 @@ tabs = {
className: 'text-left',
width: '180px',
index: 'payeeName',
render: 'payeeName',
render: 'payeeName'
},
{
title: '装卸货时间',
@ -451,7 +448,7 @@ tabs = {
title: '创建时间',
width: '180px',
className: 'text-left',
index: 'createTime',
index: 'createTime'
},
{
title: '操作',
@ -461,36 +458,38 @@ tabs = {
buttons: [
{
text: '查看评价 ',
click: (_record) => this.viewEvaluate(_record),
iif: item => item.billStatus == '5',
click: _record => this.viewEvaluate(_record),
iif: item => item.billStatus == '5'
},
{
text: '运费变更记录',
click: (_record) => this.OpenPrice(_record),
iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '6',
click: _record => this.OpenPrice(_record),
iif: item =>
item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '6'
},
{
text: '变更运费 ',
click: (_record) => this.updateFreight(_record),
iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3',
click: _record => this.updateFreight(_record),
iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3'
},
{
text: '确认签收 ',
click: (_record) => this.confirmReceipt(_record),
iif: item => item.billStatus == '4',
click: _record => this.confirmReceipt(_record),
iif: item => item.billStatus == '4'
},
{
text: '取消订单 ',
click: (_record) => this.cancellation(_record),
iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '1',
click: _record => this.cancellation(_record),
iif: item =>
item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '1'
},
{
text: '修改订单 ',
click: (_record) => this.changeOrder(_record),
iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3',
},
],
},
click: _record => this.changeOrder(_record),
iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3'
}
]
}
];
}
initSTFloat() {
@ -510,7 +509,7 @@ tabs = {
className: 'text-center',
index: 'applyUserName'
},
{ title: '状态', index: 'handleStatusLabel', className: 'text-center' },
{ title: '状态', index: 'handleStatusLabel', className: 'text-center' },
{
title: '操作',
fixed: 'right',
@ -518,7 +517,7 @@ tabs = {
buttons: [
{
text: '查看',
click: (_record) => this.FloatView(_record),
click: _record => this.FloatView(_record)
},
// {
// text: '查看协议',
@ -526,11 +525,11 @@ tabs = {
// },
{
text: '撤销',
click: (_record) => this.revoke(_record),
iif: item => item.handleStatus === '1' || item.handleStatus === 1,
},
],
},
click: _record => this.revoke(_record),
iif: item => item.handleStatus === '1' || item.handleStatus === 1
}
]
}
];
}
initSTFloatView() {
@ -548,17 +547,8 @@ tabs = {
index: 'amountAfterChange',
render: 'amountAfterChange'
},
{ title: '变更值',
index: 'amountchangeValue',
width: '120px',
className: 'text-center',
render: 'amountchangeValue'
},
{ title: '变更后',
index: 'amountBeforeChange',
render: 'amountBeforeChange',
width: '120px',
className: 'text-center' }
{ title: '变更值', index: 'amountchangeValue', width: '120px', className: 'text-center', render: 'amountchangeValue' },
{ title: '变更后', index: 'amountBeforeChange', render: 'amountBeforeChange', width: '120px', className: 'text-center' }
];
}
/**
@ -573,14 +563,13 @@ tabs = {
};
}
/**
* 伸缩查询条件
*/
* 伸缩查询条件
*/
expandToggle(): void {
this._$expand = !this._$expand;
this.sf?.setValue('/_$expand', this._$expand);
}
tabChange(item: any) {
}
tabChange(item: any) {}
/**
* 重置表单
*/
@ -592,58 +581,53 @@ tabs = {
/**
* 导入货源
*/
importGoodsSource() {
importGoodsSource() {}
audit(item: any) {}
}
audit(item: any) {
}
/*
/*
* 审核关闭弹窗
view: 1
浮动费用: 0
查看评价: 3
*/
handleCancel(type: string) {
if(type === '0') {
this.isVisible = false
} else if(type === '1') {
console.log(type)
this.isVisibleView = false
} else if(type === '2') {
this.isVisibleEvaluate = false
if (type === '0') {
this.isVisible = false;
} else if (type === '1') {
console.log(type);
this.isVisibleView = false;
} else if (type === '2') {
this.isVisibleEvaluate = false;
}
}
/**
* 审核通过按钮
*/
handleOK() {
}
/**
* 审核通过按钮
*/
handleOK() {}
OpenPrice(item: any) {
this.changeId = item.id;
this.isVisible = true
this.isVisible = true;
}
/**
* 浮动费用查看
*/
/**
* 浮动费用查看
*/
FloatView(item: any) {
this.changeViewId = item.id;
this.service.request(this.service.$api_getChangeRecordBulkDetail, {id: this.changeViewId}).subscribe((res) => {
this.service.request(this.service.$api_getChangeRecordBulkDetail, { id: this.changeViewId }).subscribe(res => {
this.ViewCause = res;
})
this.isVisibleView = true
});
this.isVisibleView = true;
}
/**
*查看评价
*/
/**
*查看评价
*/
viewEvaluate(item: any) {
this.isVisibleEvaluate = true
this.isVisibleEvaluate = true;
}
/**
/**
*变更运费
*/
updateFreight(item: any) {
updateFreight(item: any) {
this.service.request(this.service.$api_getFreightChangeBulkDetail, { id: item.id }).subscribe(data => {
if (data) {
const modal = this.modal.create({
@ -651,22 +635,19 @@ tabs = {
nzWidth: 580,
nzContent: UpdateFreightComponent,
nzComponentParams: { data: { ...data, billId: item.id } },
nzFooter: null
nzFooter: null
});
modal.afterClose.subscribe(_ => {
this.st.reload(1);
this.getGoodsSourceStatistical();
});
modal.afterClose.subscribe(_ =>
{
this.st.reload(1);
this.getGoodsSourceStatistical();
}
);
}
});
}
// *确认签收
confirmReceipt(item: any) {
confirmReceipt(item: any) {
const modalRef = this.modal.create({
nzTitle: '确认签收',
nzWidth: '50%',
@ -678,8 +659,8 @@ tabs = {
nzFooter: null
});
modalRef.afterClose.subscribe((result: any) => {
this.st.load(1);
this.getGoodsSourceStatistical()
this.st.load(1);
this.getGoodsSourceStatistical();
});
}
userAction() {
@ -690,45 +671,45 @@ tabs = {
this.service.request(this.service.$api_get_batchSignBulkOrder, params).subscribe(res => {
if (res) {
this.st.load(1);
this.getGoodsSourceStatistical()
this.getGoodsSourceStatistical();
}
});
}
// 取消订单
cancellation(item: any) {
// api_get_cancelAnOrder
this.modal.confirm({
nzTitle: '<b>确定取消该订单吗?</b>',
nzContent: `<b>取消后无法恢复,请确认</b>`,
nzOnOk: () =>
this.service.request(this.service.$api_get_cancelAnOrder, {id: item.id}).subscribe((res) => {
if (res === true) {
this.service.msgSrv.success('操作成功!');
this.st?.reload(1);
this.getGoodsSourceStatistical()
this.initST();
}
this.st?.reload(1);
this.getGoodsSourceStatistical()
}),
// 取消订单
cancellation(item: any) {
// api_get_cancelAnOrder
this.modal.confirm({
nzTitle: '<b>确定取消该订单吗?</b>',
nzContent: `<b>取消后无法恢复,请确认</b>`,
nzOnOk: () =>
this.service.request(this.service.$api_get_cancelAnOrder, { id: item.id }).subscribe(res => {
if (res === true) {
this.service.msgSrv.success('操作成功!');
this.st?.reload(1);
this.getGoodsSourceStatistical();
this.initST();
}
this.st?.reload(1);
this.getGoodsSourceStatistical();
})
}
revoke(item: any) {
this.modal.confirm({
nzTitle: '是否确定立即撤销费用变更!</i>',
nzOnOk: () =>
this.service.request(this.service.$api_get_revokeChangeRecord, { id: item.id}).subscribe((res) => {
if(res) {
this.service.msgSrv.success('撤销成功!')
this.stFloat.reload()
this.st?.reload(1);
this.getGoodsSourceStatistical()
}
})
});
}
// 修改订单
changeOrder(value: any) {
this.router.navigate(['order-management/bulk-detailChange', value.id])
}
});
}
revoke(item: any) {
this.modal.confirm({
nzTitle: '是否确定立即撤销费用变更!</i>',
nzOnOk: () =>
this.service.request(this.service.$api_get_revokeChangeRecord, { id: item.id }).subscribe(res => {
if (res) {
this.service.msgSrv.success('撤销成功!');
this.stFloat.reload();
this.st?.reload(1);
this.getGoodsSourceStatistical();
}
})
});
}
// 修改订单
changeOrder(value: any) {
this.router.navigate(['order-management/bulk-detailChange', value.id]);
}
}

View File

@ -68,13 +68,19 @@ export class OrderManagementComplaintComponent implements OnInit {
* 查询参数
*/
get reqParams() {
const a:any = {};
const a: any = {};
if(this.resourceStatus) {
a.complaintStatus = this.resourceStatus
}
const params: any = Object.assign({}, this.sf?.value || {});
delete params._$expand;
return {
...a,
...this.sf?.value,
...params,
complainantTime: {
start: this.sf?.value?.complainantTime?.[0] || '',
end: this.sf?.value?.complainantTime?.[1] || ''
}
};
}
get selectedRows() {
@ -98,7 +104,7 @@ export class OrderManagementComplaintComponent implements OnInit {
type: 'string',
title: '投诉单号',
},
createTime: {
complainantTime: {
title: '投诉时间',
type: 'string',
ui: {