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:
潘晓云
2022-04-12 13:32:45 +08:00
parent 434142d600 50d36b6c25
commit c2ae93de14
19 changed files with 157 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html
View File

@ -13,12 +13,13 @@
<nz-card class="search-box" nzBordered>
<div nz-row nzGutter="8">
<div nz-col [nzXl]="_$expand ? 24 : 16" [nzLg]="24" [nzSm]="24" [nzXs]="24">
<div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
<sf #sf [schema]="searchSchema"
[ui]="{ '*': { spanLabelFixed: 100,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}" [compact]="true"
[button]="'none'"></sf>
</div>
<div nz-col [nzXl]="_$expand ? 24 : 8" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right"
[class.expend-options]="_$expand">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
<button nz-button [disabled]="false" (click)="resetSF()">重置</button>
<!-- <button nz-button nzType="primary" [disabled]="false"> 导出</button>

18
src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.ts
View File

@ -11,7 +11,7 @@ import { FreightAccountService } from '../../services/freight-account.service';
@Component({
selector: 'app-voucher-summary',
templateUrl: './voucher-summary.component.html',
styleUrls: ['../../../commom/less/box.less']
styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less']
})
export class VoucherSummaryComponent implements OnInit {
@ViewChild('st', { static: true })
@ -39,12 +39,12 @@ export class VoucherSummaryComponent implements OnInit {
Object.assign(requestOptions.body, {
...this.sf.value,
createtime: {
start: this.sf.value.createtime?.[0] || null,
end: this.sf.value.createtime?.[1] || null
start: this.sf.value.createtime?.[0] || '',
end: this.sf.value.createtime?.[1] || ''
},
vctime: {
start: this.sf.value.vctime?.[0] || null,
end: this.sf.value.vctime?.[1] || null
start: this.sf.value.vctime?.[0] || '',
end: this.sf.value.vctime?.[1] || ''
}
});
}
@ -286,8 +286,8 @@ export class VoucherSummaryComponent implements OnInit {
private initST(): STColumn[] {
return [
{ title: '', index: 'key', type: 'checkbox', width: 60, className: 'text-center', fixed: 'left' },
{ title: '汇总凭证号', index: 'vc2code', type: 'link', width: 140 },
{ title: '帐套', index: 'vcltdcode', width: 120 },
{ title: '汇总凭证号', index: 'vc2code', type: 'link', width: 180 },
{ title: '帐套', index: 'vcltdcode', width: 180 },
{ title: '凭证时间', index: 'createTime', type: 'date', width: 150 },
{
title: '统计区间',
@ -307,7 +307,7 @@ export class VoucherSummaryComponent implements OnInit {
{
title: '借方金额',
index: 'drmoney',
width: 120,
width: 140,
type: 'widget',
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.drmoney }) }
@ -315,7 +315,7 @@ export class VoucherSummaryComponent implements OnInit {
{
title: '贷方金额',
index: 'crmoney',
width: 120,
width: 140,
type: 'widget',
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.crmoney }) }

4
src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-24 16:58:02
* @LastEditors : Shiming
* @LastEditTime : 2022-04-11 19:03:20
* @LastEditTime : 2022-04-11 19:26:19
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -621,8 +621,10 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
this.totalTime = res?.time;
});
}
return true
} else {
this.service.msgSrv.warning('请重新手动选择地址！')
return false
}
}
});

8
src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-06 20:20:26
* @LastEditors : Shiming
* @LastEditTime : 2022-03-29 14:30:11
* @LastEditTime : 2022-04-11 22:31:18
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -127,13 +127,13 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
agreement(value: any) {
if(value ==='1'){
this.modalTitle = '附件信息';
this.modalcontent = this.i?.contractContent?.contractContent;
// this.modalcontent = this.i?.contractContent?.contractContent;
this.service.reviewPDF(this.i?.contractContent?.contractFilePath)
}else if(value === '2'){
this.modalTitle = '补充协议';
this.modalcontent = this.i?.supplementContent?.contractContent;
this.isVisible = true;
}
this.isVisible = true;
}
handleCancel() {
this.isVisible = false;

5
src/app/routes/order-management/components/risk-detail/risk-detail.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-16 10:19:08
* @LastEditors : Shiming
* @LastEditTime : 2022-03-24 14:12:14
* @LastEditTime : 2022-04-11 20:43:59
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\risk-detail\\risk-detail.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -22,7 +22,7 @@
<span >{{i?.representationsStatusLabel}}</span>
</sv>
<sv label="承运司机">{{i?.driverName ? i?.driverName + '/': ''}} {{i?.driverPhone ?i?.driverPhone + '/': '' }} {{i?.carNo}}</sv>
<sv label="车队长"> {{i?.carCaptainName ? i?.carCaptainName+ '/' : ''}}{{i?.carCaptainPhone}} </sv>
<sv label="车队长" *ngIf="i?.payeeId !== i?.driverId"> {{i?.carCaptainName ? i?.carCaptainName+ '/' : ''}}{{i?.carCaptainPhone}} </sv>
<sv label="装货时间">{{i?.loadTime}}</sv>
<sv label="卸货时间">{{i?.unloadTime}}</sv>
<sv label="装货地">{{i?.loadingPlace}}</sv>
@ -57,6 +57,7 @@
<nz-timeline nzMode="left">
<nz-timeline-item [nzLabel]="item?.operatorTimestamp" nzColor="green" *ngFor="let item of logList">
<div>{{item?.operationContent}}</div>
<div *ngIf="item?.operationContent === '驳回'">驳回原因:{{i?.auditRemark}}</div>
<div>操作人:{{item?.operator}}</div>
</nz-timeline-item>
</nz-timeline>

4
src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-23 13:39:58
* @LastEditors : Shiming
* @LastEditTime : 2022-04-11 19:03:47
* @LastEditTime : 2022-04-11 19:26:34
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail-change\\vehicle-detail-change.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -592,8 +592,10 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
this.totalTime = res?.time;
});
}
return true
} else {
this.service.msgSrv.warning('请重新手动选择地址！')
return false
}
}
});

23
src/app/routes/order-management/services/order-management.service.ts
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-03 15:31:52
* @LastEditors : Shiming
* @LastEditTime : 2022-04-11 14:35:08
* @LastEditTime : 2022-04-11 22:29:34
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\services\\order-management.service.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -244,4 +244,25 @@ export class OrderManagementService extends ShipperBaseService {
constructor(public injector: Injector) {
super(injector);
}
public reviewPDF(url: string) {
if (!url) {
return;
}
const uA = window.navigator.userAgent; // 判断浏览器内核
const isIE =
/msie\s|trident\/|edge\//i.test(uA) &&
!!('uniqueID' in document || 'documentMode' in document || 'ActiveXObject' in window || 'MSInputMethodContext' in window);
const objectUrl = url;
const a = document.createElement('a');
document.body.appendChild(a);
a.href = objectUrl;
a.download = '附件.pdf';
if (isIE) {
// 兼容IE11无法触发下载的问题
(navigator as any).msSaveBlob(url, a.download);
} else {
a.click();
}
a.remove();
}
}

2
src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts
View File

@ -870,8 +870,10 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
this.totalTime = res.time;
});
}
return true
} else {
this.service.msgSrv.warning('请重新手动选择地址！')
return false
}
}
});

2
src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts
View File

@ -754,8 +754,10 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit {
this.totalTime = res.time;
});
}
return true
} else {
this.service.msgSrv.warning('请重新手动选择地址！')
return false
}
}
});

2
src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
View File

@ -1114,8 +1114,10 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
this.getInsurersPrice(); // 计算保费金额
});
}
return true
} else {
this.service.msgSrv.warning('请重新手动选择地址！')
return false
}
}
});

2
src/app/routes/supply-management/components/release-publish/release-publish.component.ts
View File

@ -1030,8 +1030,10 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
this.getInsurersPrice(); // 计算保费金额
});
}
return true
} else {
this.service.msgSrv.warning('请重新手动选择地址！')
return false
}
}
});

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

@ -237,7 +237,7 @@ export class ETCBlacklistComponent implements OnInit {
}
},
params5: {
title: '司机姓名',
title: '车辆所有人',
type: 'string',
ui: {
placeholder: '请输入',

21
src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.ts
View File

@ -38,7 +38,7 @@ export class ETCInvoicedListComponent implements OnInit {
nzTitle: '运单交易明细',
nzContent: TransactionDetailsComponent,
nzWidth: 900,
nzComponentParams: { data: [] },
nzComponentParams: { data: item },
nzOnOk: com => {
console.log(com.selectedData);
},
@ -147,8 +147,8 @@ export class ETCInvoicedListComponent implements OnInit {
private initST(): STColumn[] {
return [
{ title: '运单号', index: 'wayBillCode' },
{ title: '订单号', index: 'billCode' },
{ title: '运单号', index: 'wayBillCode',width: 200 },
{ title: '订单号', index: 'billCode',width: 200 },
{
title: '开票状态',
index: 'invoicingStatus',
@ -157,12 +157,12 @@ export class ETCInvoicedListComponent implements OnInit {
width: 120
},
{ title: '订单类型', index: 'billTypeLabel', width: 120 },
{ title: '装货地', index: 'loadingPlace' },
{ title: '卸货地', index: 'dischargePlace' },
{ title: '司机信息', render: 'call1No' },
{ title: '车辆信息', render: 'call12No' },
{ title: '托运人', index: 'shipperAppUserName' },
{ title: '网络货运人', index: 'enterpriseInfoName' },
{ title: '装货地', index: 'loadingPlace',width: 200 },
{ title: '卸货地', index: 'dischargePlace' ,width: 200},
{ title: '司机信息', render: 'call1No' ,width: 200},
{ title: '车辆信息', render: 'call12No',width: 200 },
{ title: '托运人', index: 'shipperAppUserName',width: 200 },
{ title: '网络货运人', index: 'enterpriseInfoName' ,width: 200},
{
title: '开票金额',
index: 'invoicingAmount',
@ -179,10 +179,11 @@ export class ETCInvoicedListComponent implements OnInit {
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.invoicingNumber }) }
},
{ title: '申请时间', index: 'orderReceivingTime', type: 'date' },
{ title: '申请时间', index: 'orderReceivingTime', type: 'date',width: 200 },
{
title: '操作',
className: 'text-center',
width: 120,
buttons: [
{
text: '交易明细',

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

@ -1,16 +1,32 @@
<!--
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-04-06 10:57:56
* @LastEditors : Shiming
* @LastEditTime : 2022-04-11 21:18:15
* @FilePath : \\tms-obc-web\\src\\app\\routes\\ticket-management\\components\\etc-invoiced-list\\transaction-details\\transaction-details.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<div nz-row nzGutter="8">
<div nz-col nzSpan="19">
<sf #sf [schema]="searchSchema" [ui]="{ '*': { spanLabelFixed: 90,grid: { span: 12 } }}" [compact]="true"
[button]="'none'"></sf>
</div>
<div nz-col [nzSpan]="5" class="text-right mb-md">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
<button nz-button (click)="resetSF()">重置</button>
</div>
<div nz-col nzSpan="19">
<sf #sf [schema]="searchSchema" [ui]="{ '*': { spanLabelFixed: 90, grid: { span: 12 } } }" [compact]="true" [button]="'none'"></sf>
</div>
<div nz-col [nzSpan]="5" class="text-right mb-md">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
<button nz-button (click)="resetSF()">重置</button>
</div>
<st #st [data]="url" [columns]="columns" bordered size="small"
[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]="false" [scroll]="{ x:'860px',y: '400px' }"></st>
</div>
<st
#st
[data]="url"
[columns]="columns"
bordered
size="small"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
[loading]="false"
[scroll]="{ x: '860px', y: '400px' }"
></st>
</div>

47
src/app/routes/ticket-management/components/etc-invoiced-list/transaction-details/transaction-details.component.ts
View File

@ -1,3 +1,13 @@
/*
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-03-14 14:17:38
* @LastEditors : Shiming
* @LastEditTime : 2022-04-11 21:33:13
* @FilePath : \\tms-obc-web\\src\\app\\routes\\ticket-management\\components\\etc-invoiced-list\\transaction-details\\transaction-details.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { Component, OnInit, ViewChild } from '@angular/core';
import { Router } from '@angular/router';
import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st';
@ -10,7 +20,7 @@ import { TicketService } from '../../../services/ticket.service';
templateUrl: './transaction-details.component.html'
})
export class TransactionDetailsComponent implements OnInit {
data = [];
data :any= [];
selectedData = [];
url = `/api/fcc/ficoEtcInvoiceH/list/page`;
@ViewChild('st', { static: true })
@ -21,7 +31,7 @@ export class TransactionDetailsComponent implements OnInit {
{ title: '交易id', index: 'id' },
{ title: '交易流水号', index: 'tradeFlowNo' },
{ title: '交易金额', index: 'fee' },
{ title: '开票状态', index: 'state', type: 'enum', enum: { '0': '待开具', '1': '开具中', '2': '已开具', '3': '开票失败' } },
{ title: '开票状态', index: 'stateLabel' },
{ title: '交易时间', index: 'exTime', type: 'date' }
];
searchSchema: SFSchema = {
@ -53,24 +63,29 @@ export class TransactionDetailsComponent implements OnInit {
}
};
reqParams = {};
constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) {}
ngOnInit(): void {}
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
Object.assign(requestOptions.body, {
...this.sf.value,
exTime: {
start: this.sf.value.exTime?.[0] || null,
end: this.sf.value.exTime?.[1] || null
}
});
ngOnInit(): void {
console.log(this.data);
}
get reqParams() {
const a: any = {};
if (this.data?.id) {
a.wayBillId = this.data?.wayBillId;
}
return requestOptions;
};
const params: any = Object.assign({}, this.sf?.value || {});
delete params._$expand;
return {
...a,
...params,
exTime: {
start: this.sf?.value?.exTime?.[0] || '',
end: this.sf?.value?.exTime?.[1] || ''
}
};
}
/**
* 重置表单

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

@ -20,7 +20,7 @@
<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> 导出</button> -->
<button nz-button (click)="exprot()"> 导出</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
@ -52,7 +52,7 @@
(click)="this.rejectAction(selectedRows)">驳回</button>
<button nz-button *ngIf="resourceStatus !=='4' && resourceStatus !=='5'"
(click)="changeAddress(selectedRows)">修改地址</button>
<button nz-button *ngIf="resourceStatus==='3' || !resourceStatus" (click)="printOrder(selectedRows)">打印面单</button>
<button nz-button *ngIf="resourceStatus==='3' || !resourceStatus" (click)="printOrder(selectedRows)">快递下单</button>
</div>
</ng-template>
@ -74,4 +74,4 @@
</se>
</div>
</div>
</ng-template>
</ng-template>

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

@ -165,7 +165,7 @@ export class InvoiceRequestedComponent {
return;
}
const modal = this.nzModalService.create({
nzTitle: '打印面单',
nzTitle: '快递下单',
nzContent: PrintOrderModalComponent,
nzWidth: 650,
nzComponentParams: { vatappcodes: this.selectedRows.map(item => item.vatappcode) },
@ -302,6 +302,11 @@ export class InvoiceRequestedComponent {
this.sf?.setValue('/expand', this._$expand);
}
// 导出
exprot() {
this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_export_invoice_requested_page);
}
private initSF(): SFSchema {
return {
properties: {

32
src/app/routes/ticket-management/components/invoice-requested/print-order-modal/print-order-modal.component.ts
View File

@ -39,12 +39,14 @@ export class PrintOrderModalComponent implements OnInit {
sure() {
if (this.type === 1) {
this.service.request(this.service.$api_create_express, this.vatappcodes).subscribe(res => {
if (res?.length > 0) {
this.getPDF(res);
} else {
this.service.msgSrv.warning('请到快递信息页面打印');
this.modal.destroy(true);
this.service.request(this.service.$api_create_express + '?_allow_badcode=true', this.vatappcodes).subscribe(res => {
if (res.status === 200) {
if (res?.data?.length > 0) {
this.getPDF(res.data);
} else {
this.service.msgSrv.success('快递下单成功，请到快递信息页面打印');
this.modal.destroy(true);
}
}
});
} else {
@ -62,12 +64,14 @@ export class PrintOrderModalComponent implements OnInit {
delete this.data.scontactInfo.ltdId;
delete this.data.scontactInfo.shipperId;
delete this.data.scontactInfo.id;
this.service.request(this.service.$api_get_order_summary, params).subscribe(res => {
if (res?.length > 0) {
this.service.reviewPDF(res);
} else {
this.service.msgSrv.warning('请到快递信息页面打印');
this.modal.destroy(true);
this.service.request(this.service.$api_get_order_summary + '?_allow_badcode=true', params).subscribe(res => {
if (res.status === 200) {
if (res?.data?.length > 0) {
this.service.reviewPDF(res?.data);
} else {
this.service.msgSrv.success('快递下单成功，请到快递信息页面打印');
this.modal.destroy(true);
}
}
});
}
@ -80,14 +84,12 @@ export class PrintOrderModalComponent implements OnInit {
this.modal.destroy(true);
this.service.reviewPDF(res.pdfUrl);
} else {
this.service.msgSrv.warning('下载失败');
this.service.msgSrv.success('快递下单成功，请到快递信息页面打印');
this.modal.destroy(true);
}
});
}
close() {
this.modal.destroy();
}

4
src/app/routes/ticket-management/services/ticket.service.ts
View File

@ -17,6 +17,8 @@ export class TicketService extends ShipperBaseService {
// 运营端查询发票申请记录
$api_get_invoice_requested_page = '/api/fcc/ficoVatappH/queryOperateVatappHList';
// 导出发票申请记录
$api_export_invoice_requested_page = '/api/fcc/ficoVatappH/reportOperateVatappHList';
// 获取开票申请订单明细头部信息
$api_get_invoice_requested_header_detail = '/api/fcc/ficoVatappBill/getDetailHeadByVatappHId';
// 货主/运营端获取开票申请订单明细
@ -74,7 +76,7 @@ export class TicketService extends ShipperBaseService {
// 获取分票发票抬头开票申请订单明细
$api_get_invoice_order_detail = '/api/fcc/ficoVatappBill/getDetailByVatinvHId';
// 货主/运营端获取开票申请订单明细导出
$api_export_invoice_order_detail = '/api/fcc/ficoVatappBill/reportDetailByVatapp';
$api_export_invoice_order_detail = '/api/fcc/ficoVatappBill/reportDetailByVatinvHId';
// 获取分票发票抬头开票申请费用明细
$api_get_invoice_cost_detail = '/api/fcc/ficoVatappFee/getDetailByVatinvHId';
// 获取分票发票明细