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

Merge remote-tracking branch 'origin/develop'

Browse Source
This commit is contained in:
潘晓云
2022-04-20 16:55:03 +08:00
parent f36d66e80e ffdd559370
commit 5261adbef9
38 changed files with 2259 additions and 345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/app/routes/contract-management/components/contract-frame/contract-frame.component.ts
View File

@ -32,7 +32,7 @@ export class ContractManagementFrameComponent implements OnInit {
private nzModalService: NzModalService,
private router: Router,
public shipperservice: ShipperBaseService,
private datePipe: DatePipe,
private datePipe: DatePipe
) {}
ngOnInit(): void {
@ -44,21 +44,27 @@ export class ContractManagementFrameComponent implements OnInit {
*/
get reqParams() {
const params = {
...this.sf?.value,
}
...this.sf?.value
};
delete params.signTime;
delete params._$expand;
if (this.datePipe.transform(this.sf?.value?.signTime?.[0], 'yyyy-MM-dd HH:mm:ss') && this.datePipe.transform(this.sf?.value?.signTime?.[1], 'yyyy-MM-dd HH:mm:ss')) {
if (
this.datePipe.transform(this.sf?.value?.signTime?.[0], 'yyyy-MM-dd HH:mm:ss') &&
this.datePipe.transform(this.sf?.value?.signTime?.[1], 'yyyy-MM-dd HH:mm:ss')
) {
params.signTime = {
start: this.datePipe.transform(this.sf?.value?.signTime?.[0], 'yyyy-MM-dd HH:mm:ss'),
end: this.datePipe.transform(this.sf?.value?.signTime?.[1], 'yyyy-MM-dd HH:mm:ss'),
end: this.datePipe.transform(this.sf?.value?.signTime?.[1], 'yyyy-MM-dd HH:mm:ss')
};
}
}
if (this.datePipe.transform(this.sf?.value?.effectiveEndTime?.[0], 'yyyy-MM-dd HH:mm:ss') && this.datePipe.transform(this.sf?.value?.effectiveEndTime?.[1], 'yyyy-MM-dd HH:mm:ss')) {
if (
this.datePipe.transform(this.sf?.value?.effectiveEndTime?.[0], 'yyyy-MM-dd HH:mm:ss') &&
this.datePipe.transform(this.sf?.value?.effectiveEndTime?.[1], 'yyyy-MM-dd HH:mm:ss')
) {
params.effectiveEndTime = {
start: this.datePipe.transform(this.sf?.value?.effectiveEndTime?.[0], 'yyyy-MM-dd HH:mm:ss'),
end: this.datePipe.transform(this.sf?.value?.effectiveEndTime?.[1], 'yyyy-MM-dd HH:mm:ss'),
}
end: this.datePipe.transform(this.sf?.value?.effectiveEndTime?.[1], 'yyyy-MM-dd HH:mm:ss')
};
}
return {
...params
@ -71,7 +77,7 @@ export class ContractManagementFrameComponent implements OnInit {
this.columns = [
{
title: '合同编号',
width: '100px',
width: '130px',
className: 'text-center',
render: 'contractCode'
},
@ -122,6 +128,19 @@ export class ContractManagementFrameComponent implements OnInit {
'5': { text: '已过期', color: 'warning' },
'7': { text: '已拒签', color: 'warning' }
}
},
{
title: '操作',
className: 'text-center',
fixed: 'right',
width: '80px',
buttons: [
{
text: '签署',
iif: item => item.esignFlowStatus === '0' || item.esignFlowStatus === '1' || item.esignFlowStatus === '13',
click: item => this.service.StartTheProcessToESignById(item.id, () => this.st.load(1))
}
]
}
];
}
@ -142,11 +161,11 @@ export class ContractManagementFrameComponent implements OnInit {
enum: [
{ label: '全部', value: '' },
{ label: '货主', value: 1 },
{ label: '司机', value: 2 },
{ label: '司机', value: 2 }
],
ui: {
widget: 'select',
placeholder: '请选择',
placeholder: '请选择'
}
},
contractType: {
@ -157,8 +176,8 @@ export class ContractManagementFrameComponent implements OnInit {
widget: 'dict-select',
containsAllLable: true,
params: { dictKey: 'contract:type' },
containAllLable: true,
} as SFSelectWidgetSchema,
containAllLable: true
} as SFSelectWidgetSchema
},
enterpriseInfoId: {
type: 'string',
@ -178,8 +197,8 @@ export class ContractManagementFrameComponent implements OnInit {
title: '合同对象',
ui: {
visibleIf: {
_$expand: (value: boolean) => value,
},
_$expand: (value: boolean) => value
}
}
},
signTime: {
@ -188,8 +207,8 @@ export class ContractManagementFrameComponent implements OnInit {
ui: {
widget: 'custom',
visibleIf: {
_$expand: (value: boolean) => value,
},
_$expand: (value: boolean) => value
}
}
},
effectiveEndTime: {
@ -198,8 +217,8 @@ export class ContractManagementFrameComponent implements OnInit {
ui: {
widget: 'custom',
visibleIf: {
_$expand: (value: boolean) => value,
},
_$expand: (value: boolean) => value
}
}
},
esignFlowStatus: {
@ -212,10 +231,10 @@ export class ContractManagementFrameComponent implements OnInit {
params: { dictKey: 'esign:flow:status' },
containAllLable: true,
visibleIf: {
_$expand: (value: boolean) => value,
},
} as SFSelectWidgetSchema,
},
_$expand: (value: boolean) => value
}
} as SFSelectWidgetSchema
}
},
type: 'object'
};

67
src/app/routes/contract-management/components/contract-list/contract-list.component.ts
View File

@ -31,15 +31,18 @@ export class ContractManagementContractListComponent implements OnInit {
*/
get reqParams() {
const params = {
...this.sf?.value,
}
...this.sf?.value
};
delete params.signTime;
delete params._$expand;
if (this.datePipe.transform(this.sf?.value?.signTime?.[0], 'yyyy-MM-dd HH:mm:ss') && this.datePipe.transform(this.sf?.value?.signTime?.[1], 'yyyy-MM-dd HH:mm:ss')) {
if (
this.datePipe.transform(this.sf?.value?.signTime?.[0], 'yyyy-MM-dd HH:mm:ss') &&
this.datePipe.transform(this.sf?.value?.signTime?.[1], 'yyyy-MM-dd HH:mm:ss')
) {
params.signTime = {
start: this.datePipe.transform(this.sf?.value?.signTime?.[0], 'yyyy-MM-dd HH:mm:ss'),
end: this.datePipe.transform(this.sf?.value?.signTime?.[1], 'yyyy-MM-dd HH:mm:ss'),
}
end: this.datePipe.transform(this.sf?.value?.signTime?.[1], 'yyyy-MM-dd HH:mm:ss')
};
}
return {
...params
@ -51,12 +54,12 @@ export class ContractManagementContractListComponent implements OnInit {
private nzModalService: NzModalService,
public shipperservice: ShipperBaseService,
private router: Router,
private datePipe: DatePipe,
private datePipe: DatePipe
) {}
ngOnInit(): void {
this.initST()
this.initSF()
this.initST();
this.initSF();
}
/**
* 初始化数据列表
@ -65,7 +68,7 @@ export class ContractManagementContractListComponent implements OnInit {
this.columns = [
{
title: '合同编号',
width: '100px',
width: '130px',
className: 'text-center',
render: 'contractCode'
},
@ -106,10 +109,22 @@ export class ContractManagementContractListComponent implements OnInit {
'3': { text: '已撤销', color: 'warning' },
'4': { text: '已作废', color: 'warning' },
'5': { text: '已过期', color: 'warning' },
'7': { text: '已拒签', color: 'warning' },
'7': { text: '已拒签', color: 'warning' }
}
},
},
{
title: '操作',
className: 'text-center',
fixed: 'right',
width: '80px',
buttons: [
{
text: '签署',
iif: item => item.esignFlowStatus === '0' || item.esignFlowStatus === '1' || item.esignFlowStatus === '13',
click: item => this.service.StartTheProcessToESignById(item.id, () => this.st.load(1))
}
]
}
];
}
/**
@ -121,7 +136,7 @@ export class ContractManagementContractListComponent implements OnInit {
_$expand: { type: 'boolean', ui: { hidden: true } },
contractCode: {
type: 'string',
title: '合同编号',
title: '合同编号'
},
businessCode: {
type: 'string',
@ -151,7 +166,7 @@ export class ContractManagementContractListComponent implements OnInit {
visibleIf: {
_$expand: (value: boolean) => value
},
containAllLable: true,
containAllLable: true
} as SFSelectWidgetSchema
},
resourceType: {
@ -164,8 +179,8 @@ export class ContractManagementContractListComponent implements OnInit {
containsAllLable: true,
visibleIf: {
_$expand: (value: boolean) => value
},
} as SFSelectWidgetSchema,
}
} as SFSelectWidgetSchema
},
enterpriseInfoId: {
type: 'string',
@ -185,8 +200,8 @@ export class ContractManagementContractListComponent implements OnInit {
title: '合同对象',
ui: {
visibleIf: {
_$expand: (value: boolean) => value,
},
_$expand: (value: boolean) => value
}
}
},
signTime: {
@ -196,9 +211,9 @@ export class ContractManagementContractListComponent implements OnInit {
widget: 'sl-from-to-search',
format: 'yyyy-MM-dd',
visibleIf: {
_$expand: (value: boolean) => value,
},
} as SFDateWidgetSchema,
_$expand: (value: boolean) => value
}
} as SFDateWidgetSchema
},
esignFlowStatus: {
title: '状态',
@ -210,11 +225,11 @@ export class ContractManagementContractListComponent implements OnInit {
containsAllLable: true,
visibleIf: {
_$expand: (value: boolean) => value
}
} as SFSelectWidgetSchema
}
},
} as SFSelectWidgetSchema,
},
},
type: 'object',
type: 'object'
};
this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
}
@ -285,7 +300,7 @@ export class ContractManagementContractListComponent implements OnInit {
resetSF() {
this.sf.reset();
this._$expand = false;
this.isLoading = true
this.isLoading = true;
}
/**
* 伸缩查询条件

15
src/app/routes/contract-management/components/contract-partner/contract-partner.component.ts
View File

@ -70,7 +70,7 @@ export class ContractManagementPartnerComponent implements OnInit {
this.columns = [
{
title: '合同编号',
width: '100px',
width: '130px',
className: 'text-center',
render: 'contractCode'
},
@ -121,6 +121,19 @@ export class ContractManagementPartnerComponent implements OnInit {
'5': { text: '已过期', color: 'warning' },
'7': { text: '已拒签', color: 'warning' }
}
},
{
title: '操作',
className: 'text-center',
fixed: 'right',
width: '80px',
buttons: [
{
text: '签署',
iif: item => item.esignFlowStatus === '0' || item.esignFlowStatus === '1' || item.esignFlowStatus === '13',
click: item => this.service.StartTheProcessToESignById(item.id, () => this.st.load(1))
}
]
}
];
}

11
src/app/routes/contract-management/services/contract-management.service.ts
View File

@ -35,7 +35,18 @@ export class ContractManagementService extends BaseService {
$api_listPartner_page = `/api/sdc/contract/listPartner/page`;
// 获取订单合同表
$api_contract_get = `/api/sdc/contract/get`;
// 发起E签宝跟据合同ID
$api_startTheProcessToESignById = `/api/sdc/contract/startTheProcessToESignById`;
constructor(public injector: Injector) {
super(injector);
}
StartTheProcessToESignById(id: string, callback: () => void) {
this.request(this.$api_startTheProcessToESignById, { id }).subscribe(res => {
if (res) {
callback();
}
});
}
}

49
src/app/routes/datatable/components/dataindex/dataindex.component.html
View File

@ -2,33 +2,41 @@
<page-header-wrapper [title]="'数据报表'"></page-header-wrapper>
<div nz-row [nzGutter]="16">
<div nz-col class="gutter-row" [nzSpan]="6">
<g2-card [title]="'客户预存款总额'" [bordered]="true" [total]="'¥ 126,560.00'" [footer]="footer" contentHeight="46">
<ng-template #footer>
<g2-mini-area line color="#cceafe" height="45" [data]="visitData" (clickItem)="handleClick($event)">
<g2-card [title]="'客户预存款总额'" [bordered]="true" [total]="totalAdvanceDeposit?.totalAmount || '¥ 0.00万'"
[footer]="AdvanceDepositFooter" contentHeight="46">
<ng-template #AdvanceDepositFooter>
<g2-mini-area line color="#cceafe" height="45" [data]="totalAdvanceDeposit?.list || []"
(clickItem)="handleClick($event)">
</g2-mini-area>
</ng-template>
</g2-card>
</div>
<div nz-col class="gutter-row" [nzSpan]="6">
<g2-card [title]="'业绩量总额'" [bordered]="true" [total]="'¥ 126,560.00'" [footer]="footer" contentHeight="46">
<ng-template #footer>
<g2-mini-area line color="#cceafe" height="45" [data]="visitData" (clickItem)="handleClick($event)">
<g2-card [title]="'业绩量总额'" [bordered]="true" [total]="totalPerformanceVolume?.totalAmount || '¥ 0.00万'"
[footer]="PerformanceVolumeFooter" contentHeight="46">
<ng-template #PerformanceVolumeFooter>
<g2-mini-area line color="#cceafe" height="45" [data]="totalPerformanceVolume?.list || []"
(clickItem)="handleClick($event)">
</g2-mini-area>
</ng-template>
</g2-card>
</div>
<div nz-col class="gutter-row" [nzSpan]="6">
<g2-card [title]="'司机应付总额'" [bordered]="true" [total]="'¥ 126,560.00'" [footer]="footer" contentHeight="46">
<g2-card [title]="'司机应付总额'" [bordered]="true" [total]="totalFreight?.totalAmount || '¥ 0.00万'" [footer]="footer"
contentHeight="46">
<ng-template #footer>
<g2-mini-area line color="#cceafe" height="45" [data]="visitData" (clickItem)="handleClick($event)">
<g2-mini-area line color="#cceafe" height="45" [data]="totalFreight?.list || []"
(clickItem)="handleClick($event)">
</g2-mini-area>
</ng-template>
</g2-card>
</div>
<div nz-col class="gutter-row" [nzSpan]="6">
<g2-card [title]="'附加费总额'" [bordered]="true" [total]="'¥ 126,560.00'" [footer]="footer" contentHeight="46">
<ng-template #footer>
<g2-mini-area line color="#cceafe" height="45" [data]="visitData" (clickItem)="handleClick($event)">
<g2-card [title]="'附加费总额'" [bordered]="true" [total]="totalSurcharge?.totalAmount || '¥ 0.00万'"
[footer]="SurchargeFooter" contentHeight="46">
<ng-template #SurchargeFooter>
<g2-mini-area line color="#cceafe" height="45" [data]="totalSurcharge?.list || []"
(clickItem)="handleClick($event)">
</g2-mini-area>
</ng-template>
</g2-card>
@ -37,32 +45,29 @@
<div nz-row [nzGutter]="16">
<div nz-col class="gutter-row" [nzSpan]="12">
<nz-card [nzTitle]="'订单类型比例'">
<g2-custom delay="100" (render)="render($event)"></g2-custom>
<g2-custom #g2custom delay="100"></g2-custom>
</nz-card>
</div>
<div nz-col class="gutter-row" [nzSpan]="12">
<nz-card [nzTitle]="'大区业绩完成情况'">
<g2-timeline
[data]="chartData"
[titleMap]="{ y1: '客流量', y2: '支付笔数' }"
[height]="200"
mask="MM月DD日"
[slider]="false"
></g2-timeline>
<!-- <g2-timeline [data]="chartData" [titleMap]="{ y1: '订单金额（元）', y2: '' }" [height]="200" mask="MM月DD日"
[slider]="false"></g2-timeline> -->
<g2-custom #RegionalPerforman delay="100"></g2-custom>
</nz-card>
</div>
</div>
<div nz-row [nzGutter]="16">
<div nz-col class="gutter-row" [nzSpan]="12">
<nz-card [nzTitle]="'运单直付比例'">
<g2-pie #pie title="销售额" subTitle="销售额" [total]="total" [valueFormat]="format" [data]="salesPieData" height="294"
<!-- <g2-pie #pie title="销售额" subTitle="销售额" [total]="total" [valueFormat]="format" [data]="salesPieData" height="294"
(clickItem)="handleClick($event)" [lineWidth]="10">
</g2-pie>
</g2-pie> -->
<g2-custom #BillDirectProportion delay="100"></g2-custom>
</nz-card>
</div>
<div nz-col class="gutter-row" [nzSpan]="12">
<nz-card [nzTitle]="'业绩完成情况'">
<g2-bar height="200" [title]="'销售额趋势'" [data]="salesData" (clickItem)="handleClick($event)"></g2-bar>
<g2-bar [data]="salesData" (clickItem)="handleClick($event)" height="400"></g2-bar>
</nz-card>
</div>

343
src/app/routes/datatable/components/dataindex/dataindex.component.ts
View File

@ -1,4 +1,4 @@
import { Component, ElementRef, NgZone, OnInit, ViewChild } from '@angular/core';
import { ChangeDetectorRef, Component, ElementRef, NgZone, OnInit, ViewChild } from '@angular/core';
import { ModalHelper, _HttpClient } from '@delon/theme';
import { G2MiniAreaClickItem, G2MiniAreaData } from '@delon/chart/mini-area';
import { G2PieClickItem, G2PieComponent, G2PieData } from '@delon/chart/pie';
@ -6,119 +6,119 @@ import { format } from 'date-fns';
import { DataService } from '../../services/data.service';
import { Chart, registerShape, Util } from '@antv/g2';
import { G2TimelineClickItem, G2TimelineData } from '@delon/chart/timeline';
import { CurrencyPipe } from '@angular/common';
import { LOGS } from '_mock';
import { G2CustomComponent } from '@delon/chart/custom';
@Component({
selector: 'app-datatable-dataindex',
templateUrl: './dataindex.component.html',
styleUrls: ['./dataindex.component.less']
styleUrls: ['./dataindex.component.less'],
providers: [CurrencyPipe]
})
export class DatatableDataindexComponent implements OnInit {
@ViewChild('pie', { static: false }) pie!: G2PieComponent;
chartData: G2TimelineData[] = [];
visitData = this.genData();
salesData = this.genData();
salesPieData: G2PieData[] = [];
total = '';
@ViewChild('g2custom', { static: false }) g2custom!: G2CustomComponent;
@ViewChild('RegionalPerforman', { static: false }) RegionalPerforman!: G2CustomComponent;
@ViewChild('BillDirectProportion', { static: false }) BillDirectProportion!: G2CustomComponent;
salesData: any[] = [];
constructor(private service: DataService, private ngZone: NgZone) {
totalAdvanceDeposit: { totalAmount: string; list: G2MiniAreaData[] } = { totalAmount: '0', list: this.genData() };
totalPerformanceVolume: { totalAmount: string; list: G2MiniAreaData[] } = { totalAmount: '0', list: this.genData() };
totalFreight: { totalAmount: string; list: G2MiniAreaData[] } = { totalAmount: '0', list: this.genData() };
totalSurcharge: { totalAmount: string; list: G2MiniAreaData[] } = { totalAmount: '0', list: this.genData() };
}
billTypeDatas: any = [
{ item: '货源单', count: 0, percent: 0 },
{ item: '合同单', count: 0, percent: 0 }
];
regionalPerformanceCompletion: DataPerformanceTrendVO[] = [];
constructor(private service: DataService, private currency: CurrencyPipe) {}
ngOnInit(): void {
this.refreshPie();
this.initLineData()
}
initLineData(){
for (let i = 0; i < 20; i += 1) {
this.chartData.push({
time: new Date().getTime() + 1000 * 60 * 60 * 24 * i,
y1: Math.floor(Math.random() * 100) + 1000,
y2: Math.floor(Math.random() * 100) + 10,
});
}
}
private genData(): G2MiniAreaData[] {
const beginDay = new Date().getTime();
const res: G2MiniAreaData[] = [];
for (let i = 0; i < 20; i += 1) {
res.push({
x: format(new Date(beginDay + 1000 * 60 * 60 * 24 * i), 'yyyy-MM-dd'),
y: Math.floor(Math.random() * 100) + 10,
});
}
return res;
this.initMiniAreaData();
this.initOthersData();
}
refresh(): void {
this.visitData = this.genData();
private initMiniAreaData() {
// 客户预存款总额
this.service.request(this.service.$api_total_advance_deposit).subscribe((res: DataTotalVO) => {
if (res) {
this.totalAdvanceDeposit = this.formatMiniAreaData(res);
}
});
// 业绩量总额
this.service.request(this.service.$api_total_performance_volume).subscribe((res: DataTotalVO) => {
if (res) {
this.totalPerformanceVolume = this.formatMiniAreaData(res);
}
});
// 司机应付总额
this.service.request(this.service.$api_total_freight).subscribe((res: DataTotalVO) => {
if (res) {
this.totalFreight = this.formatMiniAreaData(res);
}
});
// 业绩量总额
this.service.request(this.service.$api_total_surcharge).subscribe((res: DataTotalVO) => {
if (res) {
this.totalSurcharge = this.formatMiniAreaData(res);
}
refreshPie(): void {
const rv = (min: number = 0, max: number = 5000) => Math.floor(Math.random() * (max - min + 1) + min);
this.salesPieData = [
{
x: '家用电器',
y: rv(),
},
{
x: '食用酒水',
y: rv(),
},
{
x: '个护健康',
y: rv(),
},
{
x: '服饰箱包',
y: rv(),
},
{
x: '母婴产品',
y: rv(),
},
];
if (Math.random() > 0.5) {
this.salesPieData.push({
x: '其他',
y: rv(),
});
}
this.total = `&yen ${this.salesPieData.reduce((pre, now) => now.y + pre, 0).toFixed(2)}`;
if (this.pie) {
// 等待组件渲染
setTimeout(() => {
console.log('a')
this.pie.changeData()
});
private initOthersData() {
// 订单类型比例
this.service.request(this.service.$api_getBillTypeProportion).subscribe(res => {
if (res) {
this.billTypeDatas = this.formatCoordinateData(res);
this.initBillChart(this.g2custom['el'].nativeElement as any);
}
});
// 大区业绩完成情况
this.service.request(this.service.$api_getBillAmount).subscribe((res: DataPerformanceTrendVO[]) => {
if (res) {
this.regionalPerformanceCompletion = res.map(item => ({ ...item, time: new Date(item.time)?.getTime() }));
this.initRegionalPerformanceChart(this.RegionalPerforman['el'].nativeElement as any, this.regionalPerformanceCompletion);
}
});
// 订单类型比例
this.service.request(this.service.$api_getWayBillDirectProportion).subscribe(res => {
if (res) {
const billTypeDatas = this.formatCoordinateData(res.map((item: any) => ({ ...item, billType: item.wayBillType })));
this.initBillChart(this.BillDirectProportion['el'].nativeElement as any, billTypeDatas);
}
});
// 统计订单结算金额-趋势
this.service.request(this.service.$api_get_bill_payment_amount).subscribe(res => {
if (res) {
this.salesData = this.formatBarData(res);
}
});
}
handleClick(data: G2MiniAreaClickItem): void {
this.service.msgSrv.info(`${data.item.x} - ${data.item.y}`);
}
format(val: number): string {
return `&yen ${val.toFixed(2)}`;
}
render(el: ElementRef<HTMLDivElement>): void {
this.ngZone.runOutsideAngular(() => this.init(el.nativeElement));
}
private init(el: HTMLElement): void {
const data = [
{ item: '货源单', count: 40, percent: 0.4 },
{ item: '合同单', count: 21, percent: 0.21 },
{ item: '事例三', count: 17, percent: 0.17 },
{ item: '事例四', count: 13, percent: 0.13 },
{ item: '事例五', count: 9, percent: 0.09 },
];
/**
* 构建订单类型秘鲁图
* @param el
*/
private initBillChart(el: HTMLElement, datas?: any[]): void {
const data = datas || this.billTypeDatas;
const chart = new Chart({
container: el,
autoFit: true,
height: 400,
height: 400
});
// 新建一个 view 用来单独渲染Annotation
const innerView = chart.createView();
chart.coordinate('theta', {
radius: 0.6,
innerRadius: 0.7,
innerRadius: 0.7
});
chart.data(data);
@ -127,7 +127,7 @@ export class DatatableDataindexComponent implements OnInit {
formatter: val => {
val = val * 100 + '%';
return val;
},
}
});
chart.tooltip(false);
@ -136,7 +136,7 @@ export class DatatableDataindexComponent implements OnInit {
chart.legend('item', {
position: 'right', // 配置图例显示位置
custom: true, // 关键字段，告诉 G2，要使用自定义的图例
items: data.map((obj, index) => {
items: data.map((obj: any, index: any) => {
return {
name: obj.item, // 对应 itemName
value: obj.percent, // 对应 itemValue
@ -144,17 +144,17 @@ export class DatatableDataindexComponent implements OnInit {
symbol: 'square', // marker 的形状
style: {
r: 5, // marker 图形半径
fill: chart.getTheme().colors10[index], // marker 颜色，使用默认颜色，同图形对应
},
}, // marker 配置
fill: chart.getTheme().colors10[index] // marker 颜色，使用默认颜色，同图形对应
}
} // marker 配置
};
}),
itemValue: {
style: {
fill: '#999',
fill: '#999'
}, // 配置 itemValue 样式
formatter: (val: any) => `${val * 100}%` // 格式化 itemValue 内容
},
}
});
chart
@ -165,7 +165,7 @@ export class DatatableDataindexComponent implements OnInit {
.style({
fillOpacity: 1,
stroke: 'white',
lineWidth: 8,
lineWidth: 8
})
.state({
active: {
@ -174,12 +174,36 @@ export class DatatableDataindexComponent implements OnInit {
return {
lineWidth: 1,
stroke: 'white',
strokeOpacity: shape.attr('fillOpacity'),
strokeOpacity: shape.attr('fillOpacity')
};
},
},
}
}
});
innerView
.annotation()
.text({
position: ['50%', '50%'],
content: data[0].item,
style: {
fontSize: 20,
fill: '#8c8c8c',
textAlign: 'center'
},
offsetY: -20
})
.text({
position: ['50%', '50%'],
content: data[0].count,
style: {
fontSize: 28,
fill: '#8c8c8c',
textAlign: 'center'
},
offsetY: 20
});
innerView.render(true);
// 移除图例点击过滤交互
chart.removeInteraction('legend-filter');
chart.interaction('element-active');
@ -198,7 +222,7 @@ export class DatatableDataindexComponent implements OnInit {
updateAnnotation(data);
} else {
// 隐藏 Annotation
clearAnnotation();
// clearAnnotation();
}
}
});
@ -216,9 +240,9 @@ export class DatatableDataindexComponent implements OnInit {
style: {
fontSize: 20,
fill: '#8c8c8c',
textAlign: 'center',
textAlign: 'center'
},
offsetY: -20,
offsetY: -20
})
.text({
position: ['50%', '50%'],
@ -226,11 +250,10 @@ export class DatatableDataindexComponent implements OnInit {
style: {
fontSize: 28,
fill: '#8c8c8c',
textAlign: 'center',
textAlign: 'center'
},
offsetX: -10,
offsetY: 20,
})
offsetY: 20
});
innerView.render(true);
lastItem = data.item;
}
@ -242,8 +265,122 @@ export class DatatableDataindexComponent implements OnInit {
innerView.render(true);
lastItem = null;
}
}
private initRegionalPerformanceChart(el: HTMLElement, data: DataPerformanceTrendVO[]) {
const chart = new Chart({
container: el,
autoFit: true,
height: 400
});
chart.data(data);
chart.scale({
time: {
alias: '日期',
type: 'time'
},
quantity: {
alias: '金额',
min: 0,
sync: true, // 将 pv 字段数值同 time 字段数值进行同步
nice: true
}
});
chart.axis('quantity', {
title: {}
});
chart.tooltip({
showCrosshairs: true,
shared: true
});
// 声明需要进行自定义图例字段： 'item'
chart.legend({
offsetY: 10,
position: 'bottom', // 配置图例显示位置
custom: true, // 关键字段，告诉 G2，要使用自定义的图例
items: [
{
name: '订单金额 （元）', // 对应 itemName
value: '' // 对应 itemValue
}
],
itemValue: {
style: {
fill: '#999'
} // 配置 itemValue 样式
}
});
chart.line().position('time*quantity').color('#4FAAEB');
chart.render();
}
private formatMiniAreaData(data: DataTotalVO) {
return {
totalAmount: `${this.currency.transform(data.totalAmount || 0)}万`,
list: data.list?.map(item => ({
x: item.time,
y: item.quantity
}))
};
}
private formatCoordinateData(data: DataBillTypeProportion[]): any[] {
const total = data.map(item => item.quantity).reduce((pre, next) => pre + next);
const rs: any[] = [];
data.forEach(item => {
rs.push({
item: (BILLTYPE as any)[item.billType],
count: item.quantity,
percent: Number((item.quantity / total).toFixed(2))
});
});
return rs;
}
private formatBarData(data: DataPerformanceTrendVO[]): any[] {
return data.map(item => ({
x: item.time,
y: item.quantity,
color: '#f50'
}));
}
private genData(): G2MiniAreaData[] {
const beginDay = new Date().getTime();
const res: G2MiniAreaData[] = [];
for (let i = 0; i < 20; i += 1) {
res.push({
x: format(new Date(beginDay + 1000 * 60 * 60 * 24 * i), 'yyyy-MM-dd'),
y: Math.floor(Math.random() * 100) + 10
});
}
return res;
}
}
interface DataTotalVO {
totalAmount: number;
list: DataPerformanceTrendVO[];
}
interface DataPerformanceTrendVO {
quantity: number;
time: number;
}
interface DataBillTypeProportion {
billType: BILLTYPE;
quantity: number;
}
enum BILLTYPE {
'HY' = '货源单',
'HT' = '合同单',
'ZF' = '直付',
'CDZ' = '车队长'
}

10
src/app/routes/datatable/services/data.service.ts
View File

@ -100,7 +100,15 @@ export class DataService extends BaseService {
// 数据报表-统计订单金额-趋势
$api_getBillAmount = `/api/sdc/reportData/getBillAmount`;
// // 数据报表-统计订单金额-趋势
// $api_getBillAmount = `/api/sdc/reportData/getBillAmount`;
$api_get_bill_payment_amount = `/api/sdc/reportData/getBillPaymentAmount`;
// 客户预存款总额
$api_total_advance_deposit = `/api/sdc/reportData/getTotalAdvanceDeposit`;
// 业绩量总额
$api_total_performance_volume = `/api/sdc/reportData/getTotalPerformanceVolume`;
// 运费总额
$api_total_freight = `/api/sdc/reportData/getTotalFreight`;
// 附加费总额
$api_total_surcharge = `/api/sdc/reportData/getTotalSurcharge`;

9
src/app/routes/partner/partner-routing.module.ts
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-02-24 15:07:57
* @LastEditors : Shiming
* @LastEditTime : 2022-03-11 15:22:36
* @LastEditTime : 2022-04-20 15:42:10
* @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\partner-routing.module.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -49,6 +49,7 @@ import { BannerComponentsAddComponent } from './knowledge/banner/components/add/
import { PersonalPartnerDetailComponent } from './partner-list/components/personal-partner-detail/personal-partner-detail.component';
import { ParterAdviceFeedbackListComponent } from './advice-feedback/components/list/list.component';
import { ParterAdviceFeedbackDetailComponent } from './advice-feedback/components/feedback-detail/feedback-detail.component';
import { PartnerSystemConfigComponent } from './system-config/components/config/config.component';
const routes: Routes = [
{
@ -152,6 +153,12 @@ const routes: Routes = [
{ path: 'record/detail/:id', component: PartnerRecordedDetailComponent }
]
},
{
path: 'config',
children: [
{ path: '', component: PartnerSystemConfigComponent },
]
},
{
path: 'knowledge',
children: [

6
src/app/routes/partner/partner.module.ts
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-03-09 14:34:55
* @LastEditors : Shiming
* @LastEditTime : 2022-03-11 15:28:01
* @LastEditTime : 2022-04-20 15:45:20
* @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\partner.module.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -63,6 +63,7 @@ import { ParterAdviceFeedbackListComponent } from './advice-feedback/components/
import { ParterAdviceFeedbackDetailComponent } from './advice-feedback/components/feedback-detail/feedback-detail.component';
import { ParterRebateManageMentAddPartnerListComponent } from './rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component';
import { ChannelLogModalComponent } from './partner-list/components/channel-log-modal/channel-log-modal.component';
import { PartnerSystemConfigComponent } from './system-config/components/config/config.component';
const COMPONENTS: any[] = [
PartnerBusinessStatisticsIndexComponent,
@ -115,7 +116,8 @@ const COMPONENTS: any[] = [
ParterAdviceFeedbackListComponent,
ParterAdviceFeedbackDetailComponent,
ParterRebateManageMentAddPartnerListComponent,
ChannelLogModalComponent
ChannelLogModalComponent,
PartnerSystemConfigComponent
];
@NgModule({

187
src/app/routes/partner/system-config/components/config/config.component.html Normal file
View File

@ -0,0 +1,187 @@
<nz-card>
<div nz-row [nzGutter]="8">
<div nz-col nzSpan="4">
<ul nz-menu nzMode="inline" class="card-height">
<li nz-menu-item [nzSelected]="idx === 0" (click)="changeType(idx)"
*ngFor="let item of tabs; let idx = index">
{{ item.name }}
</li>
</ul>
</div>
<div nz-col nzSpan="20" style="overflow: scroll">
<nz-card class="card-height" [nzBordered]="null" nzSize="small" *ngIf="selectedTab===0 ">
<h2 style="font-weight: 800;">货主端配置</h2>
<h3 style="font-weight: 600;margin-left: 120px;">图片配置</h3>
<sf style="margin-left: 30px" #sf mode="default" [formData]="i" [schema]="schema2"
[ui]="{ '*': { spanLabelFixed: 200,grid: { span: 24 }} }" button="none">
<ng-template sf-template="start" let-me let-ui="ui" let-schema="schema">
</ng-template>
<template id="tpl">
<span>so good </span>
</template>
<ng-template sf-template="time2" let-me let-ui="ui" let-schema="schema">
<div class="text-left">可输入字符</div>
<nz-range-picker extend nzFormat="HH:mm:ss"></nz-range-picker>
</ng-template>
</sf>
<h3 style="font-weight: 600;margin-left: 140px;" class="mb-md">短信配置</h3>
<div nz-row nzGutter="8">
<div nz-col nzSpan="24" se-container [labelWidth]="230" [se-container]="1">
<se label="短信内容设置" style="margin-bottom: 0;">
<p style="margin-top: 6px;">配置用户端登陆页注册帐号、修改密码、修改手机号时的短信内容</p>
<textarea nz-input rows="4"
placeholder="【运多星】您的验证码：XXXXXX。有效期10分钟，请及时输入，请勿向他人泄露您的验证码。如非本人操作，请忽略。"
style="width: 400px;"></textarea>
</se>
</div>
</div>
<h3 style="font-weight: 600;margin-left: 140px;" class="mb-md">通知配置</h3>
<div nz-row nzGutter="8">
<div nz-col nzSpan="24">
<ng-container *ngTemplateOutlet="textMessage;context:{$implicit: 'World', title:'用户实名认证审核'}">
</ng-container>
<ng-container *ngTemplateOutlet="textMessage;context:{$implicit: 'World', title: '企业认证审核'}">
</ng-container>
</div>
</div>
<h3 style="font-weight: 600;margin-left: 140px;" class="mb-md">客服电话配置</h3>
<div nz-row nzGutter="8">
<div nz-col nzSpan="24" se-container [labelWidth]="230">
<se label="客服电话" style="margin-bottom: 0;">
<input nz-input style="width: 325px;" />
</se>
</div>
</div>
</nz-card>
<nz-card class="card-height" [nzBordered]="null" nzSize="small" *ngIf="selectedTab===1">
<h2 style="font-weight: 800;">司机端配置</h2>
<h3 style="font-weight: 600;margin-left: 120px;">图片配置</h3>
<sf style="margin-left: 30px" #sf mode="default" [formData]="i" [schema]="schema"
[ui]="{ '*': { spanLabelFixed: 200,grid: { span: 24 }} }" button="none">
<ng-template sf-template="start" let-me let-ui="ui" let-schema="schema">
</ng-template>
<template id="tpl">
<span>so good </span>
</template>
<ng-template sf-template="time2" let-me let-ui="ui" let-schema="schema">
<div class="text-left">可输入字符</div>
<nz-range-picker extend nzFormat="HH:mm:ss"></nz-range-picker>
</ng-template>
</sf>
<h3 style="font-weight: 600;margin-left: 140px;" class="mb-md">短信配置</h3>
<div nz-row nzGutter="8">
<div nz-col nzSpan="24" se-container [labelWidth]="230" [se-container]="1">
<se label="短信内容设置" style="margin-bottom: 0;">
<p style="margin-top: 6px;">配置用户端登陆页注册帐号、修改密码、修改手机号时的短信内容</p>
<textarea nz-input rows="4"
placeholder="【运多星】您的验证码：XXXXXX。有效期10分钟，请及时输入，请勿向他人泄露您的验证码。如非本人操作，请忽略。"
style="width: 400px;"></textarea>
</se>
</div>
</div>
<h3 style="font-weight: 600;margin-left: 140px;" class="mb-md">通知配置</h3>
<div nz-row nzGutter="8">
<div nz-col nzSpan="24">
<ng-container *ngTemplateOutlet="textMessage;context:{$implicit: 'World', title:'司机实名认证审核'}">
</ng-container>
<ng-container *ngTemplateOutlet="textMessage;context:{$implicit: 'World', title: '司机驾驶证证审核'}">
</ng-container>
<div se-container [labelWidth]="230" [se-container]="1">
<se class="mb-sm">
<nz-radio-group [(ngModel)]="formDate.isAudit">
<label nz-radio [nzValue]="false" class="mt-sm">到期系统通知</label>
<label nz-radio [nzValue]="true" class="mt-sm">短信通知</label>
</nz-radio-group>
</se>
<se label="司机驾驶证证审核" class="mb-sm">
<nz-radio-group [(ngModel)]="formDate.isAudit">
<label nz-radio [nzValue]="false" class="mt-sm">审核通过系统通知</label>
<label nz-radio [nzValue]="true" class="mt-sm">短信通知</label>
</nz-radio-group>
</se>
<se class="mb-sm">
<nz-radio-group [(ngModel)]="formDate.isAudit">
<label nz-radio [nzValue]="false" class="mt-sm">审核驳回系统通知</label>
<label nz-radio [nzValue]="true" class="mt-sm">短信通知</label>
</nz-radio-group>
</se>
<se class="mb-sm">
<nz-radio-group [(ngModel)]="formDate.isAudit">
<label nz-radio [nzValue]="false" class="mt-sm">到期系统通知</label>
<label nz-radio [nzValue]="true" class="mt-sm">短信通知</label>
</nz-radio-group>
</se>
</div>
</div>
</div>
<h3 style="font-weight: 600;margin-left: 140px;" class="mt-md">客服电话配置</h3>
<div nz-row nzGutter="8">
<div nz-col nzSpan="24" se-container [labelWidth]="230">
<se label="客服电话" >
<input nz-input style="width: 325px;" />
</se>
</div>
</div>
<h3 style="font-weight: 600;margin-left: 140px;" class="mt-md">证件提醒配置</h3>
<div nz-row nzGutter="8">
<div nz-col nzSpan="24" se-container [labelWidth]="230" [se-container]="1">
<se label="证件临期提醒" style="margin-bottom: 0;">
距离到期时间
<input type="number" nz-input style="width: 40px;"/>
天开始提醒，每隔
<input type="number" nz-input style="width: 40px;" />
天提醒一次
</se>
</div>
</div>
</nz-card>
<div class="mb-md save-btn">
<button class="ml-lg" nz-button nzSize="large" nzType="primary">保存</button>
<button class="ml-lg" nz-button nzSize="large">取消</button>
</div>
</div>
</div>
</nz-card>
<ng-template #textMessage let-data="data" let-title="title">
<div se-container [labelWidth]="230" [se-container]="1">
<se [label]="title" style="margin-bottom: 0;">
<nz-radio-group [(ngModel)]="formDate.isAudit">
<label nz-radio [nzValue]="false" class="mt-sm">审核通过系统通知</label>
<label nz-radio [nzValue]="true" class="mt-sm">短信通知</label>
</nz-radio-group>
</se>
<se class="mb-sm">
<label for="">通知标题 : </label>
<input nz-input placeholder="请不要超过20个汉字" style="width: 325px;" maxlength="20" />
</se>
<se class="mb-sm">
<label for="">通知内容 : </label>
<input nz-input placeholder="请不要超过50个汉字" style="width: 325px;" maxlength="50" />
</se>
<se class="mb-sm">
<nz-radio-group [(ngModel)]="formDate.isAudit">
<label nz-radio [nzValue]="false" class="mt-sm">审核驳回系统通知</label>
<label nz-radio [nzValue]="true" class="mt-sm">短信通知</label>
</nz-radio-group>
</se>
<se class="mb-sm">
<label for="">通知标题 : </label>
<input nz-input placeholder="请不要超过20个汉字" style="width: 325px;" maxlength="20" />
</se>
<se class="mb-sm">
<label for="">通知内容 : </label>
<input nz-input placeholder="请不要超过50个汉字" style="width: 325px;" maxlength="50" />
</se>
<se class="mb-sm">
<div class=" d-flex">
<label for="">短信内容 : </label>
<textarea nz-input rows="3" placeholder="【运多星】您的账号：XXXXXX。实名认证审核已被驳回，请重新上传"
style="width: 325px;margin-left: 14px;"></textarea>
</div>
</se>
</div>
</ng-template>

22
src/app/routes/partner/system-config/components/config/config.component.less Normal file
View File

@ -0,0 +1,22 @@
:host {
::ng-deep {
.card-height {
min-height: 600px;
}
.save-btn {
width : 100%;
text-align: right;
}
.block-radio {
display : flex;
min-height : 32px;
}
input {
width : 100px;
margin-left: 10px;
}
}
}

258
src/app/routes/partner/system-config/components/config/config.component.ts Normal file
View File

@ -0,0 +1,258 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { SFComponent, SFSchema, SFUploadWidgetSchema } from '@delon/form';
import { Observable, Observer } from 'rxjs';
import { ConfigService } from '../../services/config.service';
@Component({
selector: 'app-config',
templateUrl: './config.component.html',
styleUrls: ['./config.component.less']
})
export class PartnerSystemConfigComponent implements OnInit {
@ViewChild('sf', { static: false }) sf!: SFComponent;
formDate: any = {
isAudit: false,
isEveryDay: false,
isEveryWeek: false
};
tabs = [
{
name: '货主端配置'
},
{
name: '司机端配置'
}
];
selectedTab = 0;
checkOptionsOne = [
{ label: '周一', value: '周一', checked: true },
{ label: '周二', value: '周二' },
{ label: '周三', value: '周三' },
{ label: '周四', value: '周四' },
{ label: '周五', value: '周五' },
{ label: '周六', value: '周六' },
{ label: '周日', value: '周日' }
];
i: any;
schema!: SFSchema;
schema2!: SFSchema;
imageConfig = {
widget: 'upload',
action: `/scm/cms/cms/upload/multipartFile/fileModel`,
limit: 1,
limitFileCount: 1,
resReName: 'url',
urlReName: 'url',
data: {
appId: this.service.envSrv.getEnvironment().appId
},
multiple: false,
listType: 'picture-card',
showRequired: true
};
constructor(private service: ConfigService) {}
ngOnInit() {
this.initSF();
}
changeType(type: number): void {
this.selectedTab = type;
}
initSF() {
this.schema = {
properties: {
sysMinLogo: {
type: 'string',
title: '系统LOGO（大）',
// enum: [],
ui: {
...this.imageConfig,
descriptionI18n: '大尺寸logo，支持JPG、PNG格式，文件小于2M（建议尺寸300*170px）。',
change: args => {
if (args.type === 'success') {
const avatar = this.getImageModel(args, 'sysMinLogo');
this.sf?.setValue('/sysMinLogo', avatar);
this.i.sysMinLogo = avatar;
}
},
beforeUpload: this.uploadBefore
} as SFUploadWidgetSchema
},
sysMaxLogo: {
type: 'string',
title: '用户默认头像',
ui: {
...this.imageConfig,
descriptionI18n: '支持JPG、PNG格式，文件小于2M（建议尺寸60*60px）。',
change: args => {
if (args.type === 'success') {
const avatar = this.getImageModel(args, -1);
this.sf?.setValue('/sysMaxLogo', avatar);
this.i.sysMaxLogo = avatar;
}
},
beforeUpload: this.uploadBefore
} as SFUploadWidgetSchema
},
sysMaxLogo1: {
type: 'string',
title: '用户默认头像',
ui: {
...this.imageConfig,
descriptionI18n: '支持JPG、PNG格式，文件小于5M（建议尺寸375*773px）。',
change: args => {
if (args.type === 'success') {
const avatar = this.getImageModel(args, -1);
this.sf?.setValue('/sysMaxLogo1', avatar);
this.i.sysMaxLogo1 = avatar;
}
},
beforeUpload: this.uploadBefore
} as SFUploadWidgetSchema
},
},
required: ['sysMinLogo', 'sysMaxLogo', 'sysMaxLogo1']
};
this.schema2 = {
properties: {
sysMinLogo: {
type: 'string',
title: '系统LOGO(小)',
// enum: [],
ui: {
...this.imageConfig,
descriptionI18n: '小尺寸logo，支持JPG、PNG格式，文件小于2M（建议尺寸32*32px）。',
change: args => {
if (args.type === 'success') {
const avatar = this.getImageModel(args, 'sysMinLogo');
this.sf?.setValue('/sysMinLogo', avatar);
this.i.sysMinLogo = avatar;
}
},
beforeUpload: this.uploadBefore
} as SFUploadWidgetSchema
},
sysMaxLogo: {
type: 'string',
title: '系统LOGO(大)',
ui: {
...this.imageConfig,
descriptionI18n: '小尺寸logo，支持JPG、PNG格式，文件小于2M（建议尺寸32*32px）。',
change: args => {
if (args.type === 'success') {
const avatar = this.getImageModel(args, -1);
this.sf?.setValue('/sysMaxLogo', avatar);
this.i.sysMaxLogo = avatar;
}
},
beforeUpload: this.uploadBefore
} as SFUploadWidgetSchema
},
sysMaxLogo1: {
type: 'string',
title: '用户默认头像',
ui: {
...this.imageConfig,
descriptionI18n: '支持JPG、PNG格式，文件小于2M（建议尺寸60*60px）。',
change: args => {
if (args.type === 'success') {
const avatar = this.getImageModel(args, -1);
this.sf?.setValue('/sysMaxLogo1', avatar);
this.i.sysMaxLogo1 = avatar;
}
},
beforeUpload: this.uploadBefore
} as SFUploadWidgetSchema
},
sysMaxLogo2: {
type: 'string',
title: '企业默认头像',
ui: {
...this.imageConfig,
descriptionI18n: '支持JPG、PNG格式，文件小于2M（建议尺寸60*60px）。',
change: args => {
if (args.type === 'success') {
const avatar = this.getImageModel(args, -1);
this.sf?.setValue('/sysMaxLogo2', avatar);
this.i.sysMaxLogo2 = avatar;
}
},
beforeUpload: this.uploadBefore
} as SFUploadWidgetSchema
},
sysMaxLogo3: {
type: 'string',
title: '货主PC端登陆页海报',
ui: {
...this.imageConfig,
descriptionI18n: '支持JPG、PNG格式，文件小于5M（建议尺寸1920*630px）。',
change: args => {
if (args.type === 'success') {
const avatar = this.getImageModel(args, -1);
this.sf?.setValue('/sysMaxLogo3', avatar);
this.i.sysMaxLogo3 = avatar;
}
},
beforeUpload: this.uploadBefore
} as SFUploadWidgetSchema
},
sysMaxLogo4: {
type: 'string',
title: 'APP开屏海报',
ui: {
...this.imageConfig,
descriptionI18n: '支持JPG、PNG格式，文件小于5M（建议尺寸375*773px）。',
change: args => {
if (args.type === 'success') {
const avatar = this.getImageModel(args, -1);
this.sf?.setValue('/sysMaxLogo4', avatar);
this.i.sysMaxLogo4 = avatar;
}
},
beforeUpload: this.uploadBefore
} as SFUploadWidgetSchema
},
},
required: ['sysMinLogo', 'sysMaxLogo', 'sysMaxLogo1', 'sysMaxLogo2', 'sysMaxLogo3', 'sysMaxLogo4']
};
}
private uploadBefore = (file: any, fileList: any) => {
return new Observable((observer: Observer<boolean>) => {
const isLt1M = file.size / 1024 / 1024 < 2;
const fileType = 'image/png,image/jpeg';
if (fileType.indexOf(file.type) === -1) {
this.service.msgSrv.warning('图片格式不正确！');
observer.complete();
return;
}
if (!isLt1M) {
// this.service.msgSrv.warning('图片需小于1M');
this.service.msgSrv.warning('图片大小超过2M!');
observer.complete();
return;
}
observer.next(isLt1M);
observer.complete();
});
};
private getImageModel(args: any, key: any) {
return [
{
uid: key,
name: 'LOGO',
status: 'done',
url: args.fileList[0].response.url,
response: {
url: args.fileList[0].response.url
}
}
];
}
}

12
src/app/routes/partner/system-config/services/config.service.ts Normal file
View File

@ -0,0 +1,12 @@
import { Injectable, Injector } from '@angular/core';
import { BaseService } from '@shared';
@Injectable({
providedIn: 'root',
})
export class ConfigService extends BaseService {
constructor(public injector: Injector) {
super(injector);
}
}

8
src/app/routes/sys-setting/components/network-freight/new/new.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-02-17 15:01:33
* @LastEditors : Shiming
* @LastEditTime : 2022-04-11 14:50:05
* @LastEditTime : 2022-04-20 16:21:58
* @FilePath : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\network-freight\\new\\new.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -36,7 +36,13 @@
<ng-template sf-template="legalPersonIdentityVO/title2" let-me let-ui="ui" let-schema="schema">
<div class="form-title" style="margin-top: 40px;margin-left: -180px;">营业执照法人信息</div>
</ng-template>
<ng-template sf-template="legalPersonIdentityVO/title3" let-me let-ui="ui" let-schema="schema">
<div class="form-title" style="margin-top: 40px;margin-left: -180px;">道运证信息</div>
</ng-template>
<ng-template sf-template="roadImg" let-me let-ui="ui" let-schema="schema">
<img height="104" src="./assets/images/road.png" class="borderImg" />
</ng-template>
<ng-template sf-template="legalPersonIdentityVO/tipsC" let-me let-ui="ui" let-schema="schema">
<div class="pr">
<div>请上传身份证原件的高清照片，若上传复印件，则需申请人签字；</div>

18
src/app/routes/sys-setting/components/network-freight/new/new.component.less
View File

@ -1,5 +1,6 @@
:host {
::ng-deep {
nz-card {
.pr {
@ -40,7 +41,6 @@
line-height: 20px;
border-left: solid 3px #1890ff;
}
}
.ant-form-item {
@ -51,10 +51,21 @@
nz-input-number {
width: 100% !important;
}
.ant-input-borderless{
padding: 0;
padding-top: 4px;
color: black;
resize:none;
}
.setCustom .ant-form-item-control{
margin-left: -100px !important
}
.borderImg{
border: solid 1px #ebf0fb;
}
.input-back {
nz-form-item {
margin-left: 0px;
margin-left: 0;
.ant-form-item-label {
flex: 0 !important;
@ -66,6 +77,5 @@
}
}
}
}
}

180
src/app/routes/sys-setting/components/network-freight/new/new.component.ts
View File

@ -17,7 +17,6 @@ import { NzUploadFile } from 'ng-zorro-antd/upload';
import { of } from 'rxjs';
import { SystemService } from '../../../services/system.service';
const IMAGECONFIG = {
previewFile: (file: NzUploadFile) => of(file.url),
action: apiConf.waterFileUpload,
@ -53,11 +52,11 @@ export class NetworkFreightNewComponent implements OnInit {
sf1FormData: any = {
legalPersonIdentityVO: {
certificatePhotoFrontWatermark: '',
certificatePhotoBackWatermark: '',
},
};;
subText = '确认新增'
TabText = '新增网络货运人'
certificatePhotoBackWatermark: ''
}
};
subText = '确认新增';
TabText = '新增网络货运人';
sf2FormData: any = {};
schema: SFSchema = this.initOthersSF();
schema1: SFSchema = this.initBasicInfoSF();
@ -85,22 +84,29 @@ export class NetworkFreightNewComponent implements OnInit {
$isLoingDate: {
spanLabelFixed: 100,
grid: { xxl: 6, xl: 6, lg: 4, md: 6 }
}
},
$roadTransportPhotoWatermark: {
grid: { span: 12 },
},
$roadImg: {
grid: { span: 4 },
class: 'setCustom'
},
};
constructor(private router: Router, public service: SystemService, private route: ActivatedRoute) {}
ngOnInit() {
if (this.route.snapshot.params.id !== 'undefined') {
this.dataListInit(this.route.snapshot.params.id)
this.subText = '确认编辑'
this.TabText = '编辑网络货运人'
this.dataListInit(this.route.snapshot.params.id);
this.subText = '确认编辑';
this.TabText = '编辑网络货运人';
}
}
dataListInit(id: any) {
this.service.request(this.service.$api_get_networkTransporter_getDetail,{id: id}).subscribe((res) => {
this.service.request(this.service.$api_get_networkTransporter_getDetail, { id: id }).subscribe(res => {
console.log(res);
this.sf2FormData = res
this.sf1FormData = res.enterpriseInfoVO
this.sf2FormData = res;
this.sf1FormData = res.enterpriseInfoVO;
this.sf1FormData.isLoingDate = this.sf1FormData.operatingEndTime !== null ? false : true;
this.sf1FormData.licensePhotoWatermark = [
{
@ -109,7 +115,7 @@ export class NetworkFreightNewComponent implements OnInit {
status: 'done',
url: this.sf1FormData.licensePhotoWatermark,
response: this.sf1FormData.licensePhotoWatermark
},
}
];
console.log(this.sf1FormData);
// 营业执照法人信息
@ -121,7 +127,7 @@ export class NetworkFreightNewComponent implements OnInit {
status: 'done',
url: res.enterpriseInfoVO.legalPersonIdentityVO.certificatePhotoFrontWatermark,
response: res.enterpriseInfoVO.legalPersonIdentityVO.certificatePhotoFrontWatermark
},
}
];
this.sf1FormData.legalPersonIdentityVO.certificatePhotoBackWatermark = [
{
@ -129,19 +135,28 @@ export class NetworkFreightNewComponent implements OnInit {
name: 'LOGO',
status: 'done',
url: this.sf1FormData.legalPersonIdentityVO.certificatePhotoBackWatermark,
response: this.sf1FormData.legalPersonIdentityVO.certificatePhotoBackWatermark,
},
response: this.sf1FormData.legalPersonIdentityVO.certificatePhotoBackWatermark
}
];
const province = this.sf1FormData.fullRegionVO.provinceCode
const city = this.sf1FormData.fullRegionVO.cityCode
const area = this.sf1FormData.fullRegionVO.areaCode
this.sf1FormData.legalPersonIdentityVO.roadTransportPhotoWatermark = [
{
uid: -1,
name: 'LOGO',
status: 'done',
url: this.sf1FormData.legalPersonIdentityVO.roadTransportPhotoWatermark,
response: this.sf1FormData.legalPersonIdentityVO.roadTransportPhotoWatermark
}
];
const province = this.sf1FormData.fullRegionVO.provinceCode;
const city = this.sf1FormData.fullRegionVO.cityCode;
const area = this.sf1FormData.fullRegionVO.areaCode;
this.sf1FormData.enterpriseAddressCode = [parseInt(province), parseInt(city), parseInt(area)];
this.getRegionToThree();
})
});
}
getRegionToThree() {
// 获取一、二、三级地区详情
this.service.http.post(this.service.$api_getRegionToThree).subscribe((res) => {
this.service.http.post(this.service.$api_getRegionToThree).subscribe(res => {
if (this.sf1) {
this.sf1.getProperty('/enterpriseAddressCode')!.schema.enum = res.data;
this.sf1?.getProperty('/enterpriseAddressCode')?.widget.reset(res.data);
@ -171,27 +186,33 @@ export class NetworkFreightNewComponent implements OnInit {
if (this.sf1.value.isLoingDate) {
this.sf1.value.operatingEndTime = '';
}
console.log(this.sf1.value)
console.log(this.sf1.valid)
console.log(this.sf.value)
console.log(this.sf.valid)
console.log(this.sf1.value);
console.log(this.sf1.valid);
console.log(this.sf.value);
console.log(this.sf.valid);
const sfVlaue = this.sf1.value;
const params: any = {};
Object.assign(
params,
{
console.log(this.sf1.value);
Object.assign(params, {
...this.sf.value,
enterpriseInfoDTO: {
...this.sf1.value,
legalPersonIdentityDTO: this.sf1.value.legalPersonIdentityVO
}
}
);
delete params.enterpriseInfoDTO.legalPersonIdentityVO
legalPersonIdentityDTO: this.sf1.value.legalPersonIdentityVO,
},
roadTransportAddress: this.sf1.value.legalPersonIdentityVO.roadTransportAddress, //道路运输证地址
roadTransportEndTime: this.sf1.value.legalPersonIdentityVO.roadTransportEndTime, //道路运输许可证有效结束时间
roadTransportStartTime: this.sf1.value.legalPersonIdentityVO.roadTransportStartTime, //道路运输许可证有效开始时间
roadTransportPhotoWatermark: this.sf1.value.legalPersonIdentityVO.roadTransportPhotoWatermark, //带水印道路运输照片
roadTransportPhoto: this.sf1.value.legalPersonIdentityVO.roadTransportPhoto, //经营许可证号
roadTransportLicenceNo: this.sf1.value.legalPersonIdentityVO.roadTransportLicenceNo, //道路运输照片
});
delete params.enterpriseInfoDTO.legalPersonIdentityVO;
console.log(params);
params.enterpriseInfoDTO.enterpriseAddressCode = this.sf1.value?.enterpriseAddressCode?.[2];
if (this.route.snapshot.params.id !== 'undefined') {
params.id = this.route.snapshot.params.id
params.id = this.route.snapshot.params.id;
}
this.service.request(this.service.$api_networkTransporter_save, params).subscribe(res => {
if (res) {
@ -583,9 +604,84 @@ export class NetworkFreightNewComponent implements OnInit {
grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
placeholder: '请输入法定代表人证件号'
}
},
title3: { title: '', type: 'string', ui: { widget: 'custom', offsetControl: 6 } },
roadTransportPhoto: { title: '', type: 'string', ui: { hidden: true } },
roadTransportPhotoWatermark: {
type: 'string',
title: '道运证照片',
ui: {
...IMAGECONFIG,
descriptionI18n: '请上传道运证照片，支持JPG、PNG格式，文件小于5M。蓝牌绿牌车辆，可不用传道运证',
change: args => {
if (args.type === 'success') {
console.log(args);
this.sf1.setValue('/legalPersonIdentityVO/roadTransportPhoto', args.fileList[0].response.data.fullFilePath);
this.checkTransCard(args.fileList[0].response.data.fullFilePath);
}
}
} as SFUploadWidgetSchema
},
// roadImg: {
// title: '',
// type: 'boolean',
// // enum: [{ label: '长期', value: true }],
// ui: {
// widget: 'custom'
// }
// },
roadTransportLicenceNo: {
title: '经营许可证号',
type: 'string',
maxLength: 30,
ui: {
grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
placeholder: '请输入'
}
},
required: ['certificatePhotoFront', 'certificatePhotoBack', 'name', 'certificateType', 'certificateNumber','certificatePhotoFrontWatermark','certificatePhotoBackWatermark']
roadTransportAddress: {
title: '地址',
type: 'string',
maxLength: 30,
ui: {
grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
placeholder: '请输入'
}
},
roadTransportStartTime: {
title: '发证日期',
type: 'string',
format: 'date',
ui: {
grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
placeholder: '请输入'
}
},
roadTransportEndTime: {
title: '有效期至',
type: 'string',
format: 'date',
ui: {
grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
placeholder: '请输入'
}
}
},
required: [
'certificatePhotoFront',
'certificatePhotoBack',
'name',
'certificateType',
'certificateNumber',
'certificatePhotoFrontWatermark',
'certificatePhotoBackWatermark',
'roadTransportEndTime',
'roadTransportStartTime',
'roadTransportLicenceNo',
'roadTransportPhotoWatermark',
'roadTransportAddress',
]
}
},
required: [
@ -632,4 +728,16 @@ export class NetworkFreightNewComponent implements OnInit {
required: ['website', 'costRate']
};
}
// 道路运输证识别
checkTransCard(imgurl: any) {
const params = {
transportationLicenseUrl: imgurl
};
this.service.request(this.service.$api_recognizeTransportationLicense, params).subscribe(res => {
if (res) {
this.sf.setValue('/roadTransportLicenceNo', res?.businessCertificate);
this.sf.setValue('/roadTransportStartTime', res?.issueDate);
}
});
}
}

31
src/app/routes/sys-setting/components/sms-template/sms-template.component.html Normal file
View File

@ -0,0 +1,31 @@
<page-header-wrapper [title]="'短信模板'"></page-header-wrapper>
<nz-card>
<div class="filter-wrap">
<button nz-button nzType="primary" (click)="open()"><i nz-icon nzType="plus" nzTheme="outline"></i>筛选</button>
</div>
<st #st [data]="this.service.$api_smsTemplate_page " [columns]="columns" [req]="{ process: beforeReq }"
[loading]="false" [page]="{}"></st>
</nz-card>
<nz-drawer [nzBodyStyle]="{ overflow: 'auto' }" [nzMaskClosable]="false" [nzWidth]="720" [nzVisible]="visible"
nzTitle="筛选" [nzFooter]="footerTpl" (nzOnClose)="close()">
<div *nzDrawerContent>
<sf #sf [schema]="searchSchema" [ui]="{ '*': { spanLabelFixed: 90,grid: { span: 24 } }}" [compact]="true"
[button]="'none'"></sf>
</div>
<ng-template #footerTpl>
<div style="float: right">
<button nz-button style="margin-right: 8px;" (click)="close()">取消</button>
<button nz-button nzType="primary" (click)="search()">确认</button>
</div>
</ng-template>
</nz-drawer>
<nz-modal [(nzVisible)]="isVisible" nzTitle="编辑" (nzOnCancel)="handleCancel()" (nzOnOk)="handleOk()">
<ng-container *nzModalContent>
<sf #sfEdit [formData]="tempData" [schema]="editSchema" [ui]="{ '*': { spanLabelFixed: 90,grid: { span: 24 } }}" [compact]="true"
[button]="'none'"></sf>
</ng-container>
</nz-modal>

6
src/app/routes/sys-setting/components/sms-template/sms-template.component.less Normal file
View File

@ -0,0 +1,6 @@
:host::ng-deep {
.filter-wrap {
margin-bottom: 20px;
text-align: right;
}
}

144
src/app/routes/sys-setting/components/sms-template/sms-template.component.ts Normal file
View File

@ -0,0 +1,144 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { STColumn, STComponent, STRequestOptions } from '@delon/abc/st';
import { SFComponent, SFSchema } from '@delon/form';
import { NzModalService } from 'ng-zorro-antd/modal';
import { SystemService } from '../../services/system.service';
@Component({
selector: 'app-sms-template',
templateUrl: './sms-template.component.html',
styleUrls: ['./sms-template.component.less']
})
export class SmsTemplateComponent implements OnInit {
@ViewChild('st', { static: true })
st!: STComponent;
@ViewChild('sf', { static: false })
sf!: SFComponent;
@ViewChild('sfEdit', { static: false })
sfEdit!: SFComponent;
visible = false;
isVisible = false;
tempData = {};
searchSchema: SFSchema = {
properties: {
templateCode: {
type: 'string',
title: '模板编码',
ui: { placeholder: '请输入模板编码' }
},
templateContent: {
type: 'string',
title: '模板内容',
ui: { placeholder: '请输入模板内容' }
}
}
};
editSchema: SFSchema = {
properties: {
templateCode: {
type: 'string',
title: '模板编码',
ui: { placeholder: '请输入模板编码' }
},
templateContent: {
type: 'string',
title: '模板内容',
ui: { placeholder: '请输入模板内容' }
},
templateName: {
type: 'string',
title: '模板名称',
ui: { placeholder: '请输入模板名称' }
}
}
}
columns: STColumn[] = [
{ title: '模板编码', className: 'text-center', index: 'templateCode' },
{ title: '模板内容', className: 'text-center', index: 'templateContent' },
// {
// title: '创建人', className: 'text-center', index: 'content',
// },
{
title: '更新时间',
index: 'modifyTime',
type: 'date',
className: 'text-center'
},
{
title: '操作',
buttons: [
{
text: '编辑',
click: i => this.edit(i),
}
]
}
];
constructor(public service: SystemService, private nzModalService: NzModalService, private route: ActivatedRoute) {
}
ngOnInit(): void { }
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
Object.assign(requestOptions.body, { ...this.sf.value });
}
return requestOptions;
};
edit(item: any) {
// console.log(item);
this.tempData = item;
this.isVisible = true;
}
search() {
this.st.reload(1);
this.visible = false;
}
open(): void {
this.visible = true;
}
close(): void {
this.visible = false;
}
handleOk(): void {
const value = this.sfEdit.value;
const { id, templateCode, templateName, templateContent } = value
const params = {
id,
templateCode,
templateName,
templateContent
}
this.service.request(this.service.$api_smsTemplate_edit, params).subscribe(res => {
// console.log(res);
if (res) {
this.isVisible = false;
this.st.reload();
}
})
}
handleCancel(): void {
this.isVisible = false;
}
/**
* 重置表单
*/
resetSF() {
this.sf.reset();
}
}

15
src/app/routes/sys-setting/services/system.service.ts
View File

@ -1,7 +1,7 @@
/*
* @Author: your name
* @Date: 2021-12-20 17:18:43
* @LastEditTime : 2022-02-18 13:42:49
* @LastEditTime : 2022-04-20 16:48:26
* @LastEditors : Shiming
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath : \\tms-obc-web\\src\\app\\routes\\sys-setting\\services\\system.service.ts
@ -30,7 +30,6 @@ export class SystemService extends BaseService {
// 运营管理后台转授超管角色
$api_set_shift_admin = `/api/mdc/cuc/userAuthority/shiftAdmin`;
// 分页获取应用角色列表
$api_get_role_page = '/api/mdc/cuc/roleInfo/getAppRoleInfoList';
// 分页获取配置角色列表
@ -123,7 +122,6 @@ export class SystemService extends BaseService {
// 删除系统配置项
public $api_remove_config_item = '/api/mdc/pbc/sysConfigItem/deletebatch';
// 根据网络货运人ID获取票务信息
public $api_getTicketByNetworkTransporterId = '/api/mdc/cuc/networkTransporterTicket/getTicketByNetworkTransporterId';
// 保存票务信息
@ -133,7 +131,6 @@ export class SystemService extends BaseService {
// 根据地区code查询地区详情
$api_getRegionDetailByCode = '/api/mdc/pbc/region/getRegionDetailByCode';
// 分页查询按钮列表
$api_getButtonInfoPage = '/api/mdc/cuc/buttonInfo/getButtonInfoPage';
// 新增编辑按钮信息
@ -143,7 +140,6 @@ export class SystemService extends BaseService {
// 删除按钮信息(id)
$api_deletebatchButton = '/api/mdc/cuc/buttonInfo/deletebatchButton';
// 根据条件获取公告列表
$api_getAnnouncementInfoList_page = '/api/mdc/pbc/announcementInfo/getAnnouncementInfoList';
// 获取公告信息详情
@ -155,7 +151,6 @@ export class SystemService extends BaseService {
// 新增公告信息
$api_addAnnouncementInfo = '/api/mdc/pbc/announcementInfo/addAnnouncementInfo';
// 查询保险配置
$api_insuranceConfig_list = '/api/mdc/cuc/insuranceConfig/list';
// 获取保险配置费率
@ -179,12 +174,20 @@ export class SystemService extends BaseService {
$api_setCrmCustomer = '/api/mdc/cuc/networkTransporter/setCrmCustomer';
// 获取一、二、三级地区详情
$api_getRegionToThree = '/api/mdc/pbc/region/getRegionToThree';
// 道路运输证识别
$api_recognizeTransportationLicense = '/api/mdc/pbc/hwc/ocr/recognizeTransportationLicense';
$api_getRoleTemplateInfo: string = '';
$api_getFunctionButtonInfo: string = '/api/mdc/cuc/functionButton/getFunctionButtonByFunctionId';
$api_getFunctionDataInfo: string = '';
$api_getAppList: string = '';
$api_getRoleTemplateListByAppId: string = '';
$api_updateRoleInfo: string = '';
// 短信模板list
$api_smsTemplate_page = '/api/mdc/pbc/smsTemplate/list/page';
// 短信模板编辑
$api_smsTemplate_edit = '/api/mdc/pbc/smsTemplate/save';
constructor(public injector: Injector) {
super(injector);
}

4
src/app/routes/sys-setting/sys-setting-routing.module.ts
View File

@ -25,6 +25,7 @@ import { AnnouncementMessageComponent } from './components/announcement-message/
import { InsuranceSetComponent } from './components/insurance-set/insurance-set.component';
import { NetworkFreightNewComponent } from './components/network-freight/new/new.component';
import { NoTeManagementComponent } from './components/note-management/note-management.component';
import { SmsTemplateComponent } from './components/sms-template/sms-template.component';
const routes: Routes = [
{ path: 'staff-management', component: StaffManagementComponent },
@ -44,7 +45,8 @@ const routes: Routes = [
{ path: 'close-account', component: CloseAccountComponent },
// { path: 'btn-management', component: BtnManagementComponent },
{ path: 'announcement-message', component: AnnouncementMessageComponent },
{ path: 'insurance-set', component: InsuranceSetComponent }
{ path: 'insurance-set', component: InsuranceSetComponent },
{ path: 'sms-template', component: SmsTemplateComponent}
];
@NgModule({

4
src/app/routes/sys-setting/sys-setting.module.ts
View File

@ -33,6 +33,7 @@ import { AnnouncementMessageComponent } from './components/announcement-message/
import { InsuranceSetComponent } from './components/insurance-set/insurance-set.component';
import { NetworkFreightNewComponent } from './components/network-freight/new/new.component';
import { NoTeManagementComponent } from './components/note-management/note-management.component';
import { SmsTemplateComponent } from './components/sms-template/sms-template.component';
const COMPONENTS = [
StaffManagementComponent,
@ -50,7 +51,8 @@ const COMPONENTS = [
NetworkFreightNewComponent,
AnnouncementMessageComponent,
InsuranceSetComponent,
NoTeManagementComponent
NoTeManagementComponent,
SmsTemplateComponent
];
const NOTROUTECOMPONENTS = [
BuyerTranspowerComponent,

98
src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.html Normal file
View File

@ -0,0 +1,98 @@
<page-header-wrapper [title]="''"></page-header-wrapper>
<nz-card>
<!-- 搜索表单 -->
<div nz-row nzGutter="8">
<div nz-col [nzSpan]="_$expand ? 24 : 18">
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
</div>
<div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
<button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="search()" >查询</button>
<button nz-button (click)="resetSF()">重置</button>
<button nz-button (click)="resetSF()">导出</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
</button>
</div>
</div>
</nz-card>
<nz-card>
<nz-tabset [nzTabBarExtraContent]="extraTemplate" *ngIf="tabs.length>0">
<nz-tab *ngFor="let tab of tabs" [nzTitle]="tab.name" (nzSelect)="selectChange(tab)">
</nz-tab>
</nz-tabset>
<!-- 数据列表 -->
<st #st [scroll]="{x:'1200px'}" [data]="service.$api_getTaxOrderPage_page" [columns]="columns"
[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, 50, 100] }" [loading]="service.http.loading">
<ng-template st-row="putStatus" let-item let-index="index">
<!-- <a (click)="viewAuditResult(item)" *ngIf="item?.billStatus === '2'">{{item?.billStatusLabel}}</a> -->
<span *ngIf="item?.putStatus == '0'">待上传</span>
<span *ngIf="item?.putStatus == '1'">已上传</span>
<span *ngIf="item?.putStatus == '3'">上传中</span>
<span *ngIf="item?.putStatus == '2'" style="color: red;" (click)="unnormal(item)">上传异常</span>
</ng-template>
<ng-template st-row="invoiceNO" let-item let-index="index">
<a href="/">{{item.billCode}}</a>
</ng-template>
<ng-template st-row="checkStatus" let-item let-index="index">
<!-- <a (click)="viewAuditResult(item)" *ngIf="item?.billStatus === '2'">{{item?.billStatusLabel}}</a> -->
<span *ngIf="item?.checkStatus == '0'">校验中</span>
<span *ngIf="item?.checkStatus == '1'">通过</span>
<!-- <span *ngIf="item?.checkStatus == '2'" style="color: red;" (click)="unnormal(item)">不通过</span> -->
<span *ngIf="item?.checkStatus == '2'" style="color: red;" (click)="viewResult(item)">不通过</span>
</ng-template>
<ng-template st-row="driverName" let-item let-index="index">
<div> {{ item?.driverName }}{{ item?.driverPhone ? "/" + item?.driverPhone : '' }} </div>
</ng-template>
<!-- <ng-template st-row="localValid" let-item let-index="index">
<a (click)="viewResult(item)" *ngIf="item?.billStatus === '2'">{{item?.billStatusLabel}}</a>
<span *ngIf="item?.billStatus !== '2'">{{item?.billStatusLabel}}</span>
</ng-template> -->
<ng-template st-row="loadingPicture" let-item let-index="index">
<div class="imgBox">
<div *ngIf="item.loadingPicture">
<app-imagelist style="width: 60px" [imgList]="[item.loadingPicture]"> </app-imagelist>
</div>
</div>
</ng-template>
<ng-template st-row="unloadPicture" let-item let-index="index">
<div class="imgBox">
<div *ngIf="item.unloadPicture">
<app-imagelist style="width: 40px" [imgList]="[item.unloadPicture]"> </app-imagelist>
</div>
</div>
</ng-template>
<ng-template st-row="loadingLadingBill" let-item let-index="index">
<div class="imgBox">
<div *ngIf="item.loadingLadingBill">
<app-imagelist style="width: 40px" [imgList]="[item.loadingLadingBill]"> </app-imagelist>
</div>
</div>
</ng-template>
<ng-template st-row="signatureForm" let-item let-index="index">
<div class="imgBox">
<div *ngIf="item.signatureForm">
<app-imagelist style="width: 40px" [imgList]="[item.signatureForm]"> </app-imagelist>
</div>
</div>
</ng-template>
<ng-template st-row="orderAmount" let-item let-index="index">
<div class="text-right">{{item?.orderAmount | currency }}</div>
</ng-template>
</st>
</nz-card>
<ng-template #extraTemplate>
<div class="d-flex align-items-center">
<div class="mr-md">
已选择
<strong class="text-red">{{ selectedRows.length }}</strong> 条数据
</div>
<button *ngIf="selectedIndex === '0' || selectedIndex === '2'" nz-button nzType="primary" (click)="upload()">上传</button>
<button *ngIf="selectedIndex === '1' || selectedIndex === '3'" nz-button nzType="primary" (click)="recall()">撤回</button>
</div>
</ng-template>

22
src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.less Normal file
View File

@ -0,0 +1,22 @@
:host {
.text-black {
color: #000;
}
.icon {
display: inline-block;
width: 1em;
height: 1em;
stroke-width: 0;
stroke: currentColor;
/* stylelint-disable-next-line order/properties-order */
fill: currentColor;
}
::ng-deep {
.imgBox {
display: flex;
img {
width: 60px !important;
}
}
}
}

460
src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts Normal file
View File

@ -0,0 +1,460 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { STColumn, STComponent, STData } from '@delon/abc/st';
import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
import { ShipperBaseService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
import { of } from 'rxjs';
import { map } from 'rxjs/operators';
import { TaxManagementService } from '../../services/tax-management.service';
import { TaxManagementInvoiceUploadSettingComponent } from './upload-setting/upload-setting.component';
import { TaxManagementInvoiceVerifyResultComponent } from './verify-result/verify-result.component';
// import { DatatableReportingUploadSettingComponent } from '../upload-setting/upload-setting.component';
// import { DatatableReportingVerifyResultComponent } from '../verify-result/verify-result.component';
@Component({
selector: 'app-tax-management-invoice-reporting',
templateUrl: './invoice-reporting.component.html',
styleUrls: ['./invoice-reporting.component.less']
})
export class TaxManagementInvoiceReportingComponent implements OnInit {
_$expand = false;
ui!: SFUISchema;
schema!: SFSchema;
columns!: STColumn[];
@ViewChild('st', { static: false }) st!: STComponent;
@ViewChild('sf', { static: false }) sf!: SFComponent;
tabType!: string;
isLoading: boolean = false;
tabs: any[] = [
{ name: '待上传', value: '0' },
{ name: '上传中', value: '3' },
{ name: '已上传', value: '1' },
{ name: '异常', value: '2' },
{ name: '全部', value: '' }
];
selectedIndex = '0'; //选择的项目
serviceTel = '';
constructor(
public service: TaxManagementService,
private router: Router,
private ar: ActivatedRoute,
public shipperservice: ShipperBaseService,
private modal: NzModalService,
public shipperSrv: ShipperBaseService
) {
}
/**
* 查询字段个数
*/
get queryFieldCount(): number {
return Object.keys(this.schema?.properties || {}).length;
}
/**
* 查询参数
*/
get reqParams() {
const params = Object.assign({}, this.sf?.value || {}, {
putStatus: this.selectedIndex,
});
delete params._$expand;
return { ...params };
}
/**
* 选中行
*/
get selectedRows() {
return this.st?.list.filter((item: any) => item.checked) || [];
}
/**
* 伸缩查询条件
*/
expandToggle() {
this._$expand = !this._$expand;
this.sf?.setValue('/_$expand', this._$expand);
}
/**
* 重置表单
*/
resetSF() {
this.sf.reset();
this._$expand = false;
this.isLoading = true
}
/**
* 程序初始化入口
*/
ngOnInit() {
this.initSF();
this.initST();
}
/**
* 初始化查询表单
*/
initSF() {
this.schema = {
properties: {
_$expand: { type: 'boolean', ui: { hidden: true } },
putStatus: {
title: '上传状态',
type: 'string',
default: 0,
enum: [
{ label: '全部', value: 0 },
{ label: '待上传', value: 1 },
{ label: '上传中', value: 2 },
{ label: '已上传', value: 3 },
{ label: '异常', value: 4 }
],
ui: {
placeholder: '请选择',
widget: 'select',
allowClear: true
}
},
networkTransporter: {
type: 'string',
title: '网络货运人',
ui: {
widget: 'select',
placeholder: '请选择',
allowClear: true,
asyncData: () => this.shipperservice.getNetworkFreightForwarder()
}
},
hrto: {
type: 'string',
title: '购买方',
ui: {
widget: 'select',
placeholder: '请选择',
allowClear: true,
asyncData: () => this.service.getCRMCustomerId()
}
},
billCode: {
title: '订单号', type: 'string', ui: {
placeholder: '请输入', visibleIf: {
_$expand: (value: boolean) => value
}
}
},
recentlyPutTime: {
title: '开票日期',
type: 'string',
ui: {
widget: 'sl-from-to',
type: 'date',
format: 'yyyy-MM-dd',
visibleIf: {
_$expand: (value: boolean) => value,
},
} as SFDateWidgetSchema,
},
orderPayTime: {
title: '上传日期',
type: 'string',
ui: {
widget: 'sl-from-to',
type: 'date',
format: 'yyyy-MM-dd',
visibleIf: {
_$expand: (value: boolean) => value,
},
} as SFDateWidgetSchema,
},
wayBillCode: {
type: 'string',
title: '发票号码',
ui: {
placeholder: '请输入',
visibleIf: {
_$expand: (value: boolean) => value
}
},
},
wayBillCode1: {
type: 'string',
title: '发票代码',
ui: {
placeholder: '请输入',
visibleIf: {
_$expand: (value: boolean) => value
}
},
},
sts: {
title: '发票状态',
type: 'string',
ui: {
widget: 'dict-select',
containsAllLabel: true,
params: { dictKey: 'vatinv:status' },
containAllLable: true,
visibleIf: {
_$expand: (value: boolean) => value
}
} as SFSelectWidgetSchema
},
},
};
this.ui = {
'*': { spanLabelFixed: 120, grid: { span: 8, gutter: 4 }, enter: () => this.search() },
$time: { grid: { span: 24 } },
};
}
/**
* 初始化数据列表
*/
initST() {
this.columns = [
{ title: '', type: 'checkbox', className: 'text-center', width: '60px', },
{ title: '上传状态', render: 'putStatus', className: 'text-center', width: '120px', },
{ title: '发票类型', render: 'checkStatus', className: 'text-center', width: '120px', },
{
title: '发票号码',
index: 'billCode',
render: 'invoiceNO',
className: 'text-center',
width: '150px',
},
{ title: '发票代码', index: 'wayBillCode', className: 'text-center', width: '150px', },
{
title: '网络货运人',
index: 'networkTransporterName',
className: 'text-center',
width: '180px',
},
{ title: '购买方企业名称', index: 'loadingAddress', render: 'loadingPlace', className: 'text-center', width: '200px' },
{ title: '购买方统一社会信用代码', index: 'loadingDetailedAddress', render: 'loadingPlace', className: 'text-center', width: '200px' },
{ title: '订单号', index: 'unloadAddress', render: 'dischargePlace', className: 'text-center', width: '120px' },
{ title: '货物名称', index: 'unloadDetailedAddress', className: 'text-center', width: '180px' },
{ title: '价税合计', index: 'shipperName', className: 'text-center', width: '180px' },
{ title: '开票日期', index: 'shipperProvinceCode', className: 'text-center', width: '180px' },
{ title: '发票所属月份', index: 'recordTime', className: 'text-center', width: '250px' },
{ title: '发票状态', index: 'wayBillCreateTime', className: 'text-center', width: '200px' },
{ title: '上传日期', index: 'loadTime', className: 'text-center', width: '200px' },
];
}
/**
*撤回
* @param record 记录实例
*/
recall() {
if (this.selectedRows.length === 0) {
this.openWainingModal('请选择需要撤回的数据');
return;
}
let params: any[] = [];
this.selectedRows.forEach(item => {
params.push(item.id);
});
this.modal.confirm({
nzTitle: '撤回提示',
nzContent: ' 撤回后可以重新上传，重新上传会覆盖已上传数据，确定要撤回？',
nzOkText: '确定',
nzCancelText: '取消',
nzOnOk: () => {
this.service.request(this.service.$api_get_recessionTaxOrder, params).subscribe((res: any) => {
if (res) {
this.service.msgSrv.success('撤销成功');
this.search();
}
})
}
});
}
/**
*撤销
* @param record 记录实例
*/
resetData() {
if (this.selectedRows.length === 0) {
this.openWainingModal('请选择需要更新的数据！');
return;
}
let params: any[] = [];
this.selectedRows.forEach(item => {
params.push(item.billId);
});
this.service.request(this.service.$api_get_renewalOrderById, params).subscribe((res: any) => {
if (res) {
this.service.msgSrv.success('更新成功');
this.st.load(1);
}
})
}
/**
*撤销
* @param record 记录实例
*/
unnormal(value: any) {
// if (this.selectedRows.length === 0) {
// this.openWainingModal('请选择需要更新的数据！');
// return;
// }
console.log(this.selectedRows);
let params: any[] = [];
this.selectedRows.forEach(item => {
params.push(item.id);
});
this.modal.confirm({
nzTitle: '税务审核结果',
nzContent: '订单结算时间所在月份与申报月份不一致',
nzOkText: '确定',
nzCancelText: '',
nzOnOk: () => {
this.service.request(this.service.$api_get_recessionTaxOrder, params).subscribe((res: any) => {
if (res) {
this.service.msgSrv.success('撤销成功');
this.search();
}
})
}
});
}
selectChange(item: any) {
console.log(item);
this.selectedIndex = item?.value || '';
setTimeout(() => {
this.st.load();
})
}
/**
* 查看当行数据
*/
view(record: STData) {
// this.router.navigate(['../view', record.uuid], { relativeTo: this.ar });
this.router.navigate(['../detail'], {
queryParams: {
id: record.id,
},
relativeTo: this.ar
});
}
// appeal(item: any) {
// const modalRef = this.modal.create({
// nzTitle: '申诉',
// nzWidth: '40%',
// nzContent: CtcAppealComponent,
// nzComponentParams: {
// i: item,
// status: 'add'
// },
// nzFooter: null
// });
// modalRef.afterClose.subscribe(res => {
// if (res) {
// this.search({ representationsStatus: '' });
// }
// })
// }
/**
* 上传
*/
upload() {
if (this.selectedRows.length === 0) {
this.openWainingModal('请选择需要上传的数据');
return;
}
let params: any[] = [];
this.selectedRows.forEach(item => {
params.push(item.id);
});
this.service.request(this.service.$api_get_uploadingTaxOrder, params).subscribe((res: any) => {
if (res) {
this.service.msgSrv.success('上传成功');
this.st.load();
}
})
}
/**
*
* @param params 上传设置
*/
uploadSetting() {
const modalRef = this.modal.create({
nzTitle: '税务上传设置',
nzWidth: 600,
nzContent: TaxManagementInvoiceUploadSettingComponent,
nzComponentParams: {},
nzFooter: null
});
modalRef.afterClose.subscribe(res => {
if (res) {
this.st.load();
}
})
}
/**
* 查看校验结果
*/
viewResult(item: any) {
const modalRef = this.modal.create({
nzTitle: '本地校验结果',
nzWidth: 1200,
nzContent: TaxManagementInvoiceVerifyResultComponent,
nzComponentParams: {
record: item
},
nzFooter: null
});
modalRef.afterClose.subscribe(res => {
if (res) {
this.st.load();
}
})
}
/**
* 查看监管审核结果
*/
viewAuditResult(record: any) {
if (record?.billStatus !== '2') {
return;
}
this.openWainingModal('监管审核结果', record?.result)
}
search() {
this.st.load(1);
}
/**
* 异步导出
*/
export() {
this.service.exportStart(this.sf?.value, this.service.$api_async_export_order_reporting_list);
}
openWainingModal(content: string, title = '提示') {
this.modal.warning({
nzMask: false,
nzTitle: title,
nzContent: content,
})
}
}

8
src/app/routes/tax-management/components/invoice-reporting/upload-setting/upload-setting.component.html Normal file
View File

@ -0,0 +1,8 @@
<nz-spin [nzSpinning]="!i"></nz-spin>
<sf *ngIf="i" #sf mode="edit" [schema]="schema" [ui]="ui" [formData]="i" button="none">
<div class="modal-footer">
<button nz-button type="button" (click)="close()">取消</button>
<button nz-button type="submit" nzType="primary" (click)="save(sf.value)" [disabled]="!sf.valid"
[nzLoading]="service.http.loading">修改</button>
</div>
</sf>

110
src/app/routes/tax-management/components/invoice-reporting/upload-setting/upload-setting.component.ts Normal file
View File

@ -0,0 +1,110 @@
import { Component, OnInit } from '@angular/core';
import { SFSchema, SFUISchema } from '@delon/form';
import { NzModalRef } from 'ng-zorro-antd/modal';
import { TaxManagementService } from '../../../services/tax-management.service';
@Component({
selector: 'app-datatable-invoice-upload-setting',
templateUrl: './upload-setting.component.html',
})
export class TaxManagementInvoiceUploadSettingComponent implements OnInit {
record: any = {};
i: any = {};
schema!: SFSchema;
ui!: SFUISchema;
constructor(
private modal: NzModalRef,
public service: TaxManagementService
) { }
ngOnInit(): void {
this.initSF();
// this.loadData();
}
/**
* 初始化查询表单
*/
initSF() {
this.schema = {
properties: {
no: {
type: 'string',
title: '订单数据',
enum: [
{
label: '手动上传',
value: '1'
},
{
label: '自动上传',
value: '2'
}
],
description: '开启自动上传后，订单将在支付完成且风险单校验通过后自动上传',
ui: {
widget: 'radio',
}
},
owner: {
type: 'string',
title: '资金数据',
enum: [
{
label: '手动上传',
value: '1'
},
{
label: '自动上传',
value: '2'
}
],
description: '开启自动上传后，订单将在支付完成且风险单校验通过后自动上传',
ui: {
widget: 'radio',
}
},
},
required: ['owner', 'no'],
}
this.ui = {
'*': {
spanLabelFixed: 100,
grid: { span: 24 },
},
};
}
/**
* 获取设置数据
*/
loadData() {
this.service.request(this.service.$api_get_upload_setting, {}).subscribe(res => {
if (res) {
this.i = res;
}
})
}
/**
* 修改
* @param value
*/
save(value: any): void {
this.service.request(this.service.$api_upload_setting_save, { ...value }).subscribe(res => {
if (res) {
this.service.msgSrv.success('保存成功');
this.modal.close(true);
}
})
}
close(): void {
this.modal.destroy();
}
}

30
src/app/routes/tax-management/components/invoice-reporting/verify-result/verify-result.component.html Normal file
View File

@ -0,0 +1,30 @@
<div nz-row>
<div style="width: 10%">
<nz-tabset [nzTabPosition]="'left'" style="height: 100%">
<nz-tab [nzTitle]="item?.name" *ngFor="let item of tabs" (nzSelect)="selectTab(item)"></nz-tab>
</nz-tabset>
</div>
<div style="width: 90%">
<st
#st
[scroll]="{ x: '1000px', y: '600px' }"
[data]="service.$api_get_getTaxFieldCheckList"
[columns]="columns"
[req]="{ process: beforeReq }"
[res]="{ reName: { list: 'data', total: 'data' } , process: afterRes}"
[page]="{ show: false }"
[loading]="false"
[bordered]="true"
>
<ng-template st-row="freightDetails" let-item>
<div *ngFor="let item of item.freightDetails">
<div>{{ item.expenseName }}:{{ item.price | currency }} </div>
</div>
</ng-template>
</st>
</div>
</div>
<div class="modal-footer">
<button nz-button type="button" (click)="close()">取消</button>
<button nz-button type="submit" nzType="primary" (click)="update()" [nzLoading]="service.http.loading">修改</button>
</div>

139
src/app/routes/tax-management/components/invoice-reporting/verify-result/verify-result.component.ts Normal file
View File

@ -0,0 +1,139 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { Router } from '@angular/router';
import { STColumn, STComponent, STRequestOptions } from '@delon/abc/st';
import { SFSchema } from '@delon/form';
import { ModalHelper, _HttpClient } from '@delon/theme';
import { NzModalRef } from 'ng-zorro-antd/modal';
import { TaxManagementService } from '../../../services/tax-management.service';
@Component({
selector: 'app-tax-management-Invoice-reporting-verify-result',
templateUrl: './verify-result.component.html',
})
export class TaxManagementInvoiceVerifyResultComponent implements OnInit {
searchSchema: SFSchema = {
properties: {
no: {
type: 'string',
title: '编号'
}
}
};
@ViewChild('st') private readonly st!: STComponent;
columns: STColumn[] = [];
record: any = {}
subjectType: string = '0';
tabs: any[] = [
{ name: '平台信息', value: '0' },
{ name: '货主信息', value: '1' },
{ name: '司机信息', value: '2' },
{ name: '订单信息', value: '3' },
];
// get reqParams() {
// console.log(this.subjectType);
// const params ={
// subjectId: this.record?.shipperId,
// subjectType: this.subjectType,
// }
// return params;
// }
beforeReq = (requestOptions: STRequestOptions) => {let a: string = '';
switch (this.subjectType) {
case '0':
a = this.record?.networkTransporterId;
break
case '1':
a = this.record?.shipperId;
break
case '2':
a = this.record?.driverId;
break
case '3':
a = this.record?.wayBillId;
break
}
Object.assign(requestOptions.body, {
subjectId: a ,
subjectType: this.subjectType,
});
return requestOptions;
};
afterRes = (data: any[], rawData?: any) => {
console.log(data)
return data.map(item => ({
...item,
}));
};
constructor(public service: TaxManagementService, private modalRef: NzModalRef, public router: Router) {
}
ngOnInit(): void {
console.log(this.record);
this.initST();
}
/**
* 初始化数据列表
*/
initST() {
this.columns = [
{ title: '序号', type: 'no', className: 'text-center', width: '60px', },
{ title: '校验字段', index: 'checkFieldName', className: 'text-center', width: '120px', },
{
title: '是否必填',
index: 'requiredStatus',
className: 'text-center',
width: '100px',
type: 'enum',
enum: {
0: '否',
1: '是'
}
},
{ title: '上传值', index: 'fieldValue', className: 'text-center', width: '150px', },
{
title: '本地校验', index: 'checkStatus', className: 'text-center', width: '100px',
type: 'enum',
enum: {
0: '校验中',
1: '通过',
2: '不通过'
}
},
{ title: '错误内容', index: 'remark', className: 'text-center', width: '150px', },
]
}
add(): void {
// this.modal
// .createStatic(FormEditComponent, { i: { id: 0 } })
// .subscribe(() => this.st.reload());
}
selectTab(e: any) {
setTimeout(() => {
console.log(e?.value);
this.subjectType = e?.value;
console.log(this.subjectType);
this.st.load(1);
})
}
update() {
if (this.record?.billType === '1') {
window.open(location.origin + `/#/order-management/vehicle-detailChange/${this.record?.id}`)
} else if (this.record.billType === '2') {
window.open(location.origin + `/#/order-management/bulk-detailChange/${this.record?.id}`);
}
}
close(): void {
this.modalRef.destroy();
}
}

2
src/app/routes/tax-management/tax-management-routing.module.ts
View File

@ -13,6 +13,7 @@ import { RouterModule, Routes } from '@angular/router';
import { TaxManagementIndividualCollectComponent } from './components/individual-collect/individual-collect.component';
import { TaxManagementIndividualDeclareComponent } from './components/individual-declare/individual-declare.component';
import { TaxManagementIndividualIncomeComponent } from './components/individual-income/individual-income.component';
import { TaxManagementInvoiceReportingComponent } from './components/invoice-reporting/invoice-reporting.component';
import { TaxManagementOrderReportingComponent } from './components/order-reporting/order-reporting.component';
@ -21,6 +22,7 @@ const routes: Routes = [
{ path: 'income', component: TaxManagementIndividualIncomeComponent },
{ path: 'collect', component: TaxManagementIndividualCollectComponent },
{ path: 'declare', component: TaxManagementIndividualDeclareComponent },
{ path: 'invoiceReport', component: TaxManagementInvoiceReportingComponent },
];

8
src/app/routes/tax-management/taxmanagement.module.ts
View File

@ -13,6 +13,9 @@ import { SharedModule, SHARED_G2_MODULES } from '@shared';
import { TaxManagementIndividualCollectComponent } from './components/individual-collect/individual-collect.component';
import { TaxManagementIndividualDeclareComponent } from './components/individual-declare/individual-declare.component';
import { TaxManagementIndividualIncomeComponent } from './components/individual-income/individual-income.component';
import { TaxManagementInvoiceReportingComponent } from './components/invoice-reporting/invoice-reporting.component';
import { TaxManagementInvoiceUploadSettingComponent } from './components/invoice-reporting/upload-setting/upload-setting.component';
import { TaxManagementInvoiceVerifyResultComponent } from './components/invoice-reporting/verify-result/verify-result.component';
import { TaxManagementOrderReportingComponent } from './components/order-reporting/order-reporting.component';
import { TaxManagementUploadSettingComponent } from './components/order-reporting/upload-setting/upload-setting.component';
import { TaxManagementOrderVerifyResultComponent } from './components/order-reporting/verify-result/verify-result.component';
@ -25,7 +28,10 @@ const COMPONENTS: Type<void>[] = [
TaxManagementUploadSettingComponent,
TaxManagementIndividualIncomeComponent,
TaxManagementIndividualCollectComponent,
TaxManagementIndividualDeclareComponent
TaxManagementIndividualDeclareComponent,
TaxManagementInvoiceReportingComponent,
TaxManagementInvoiceUploadSettingComponent,
TaxManagementInvoiceVerifyResultComponent
]

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

@ -4,10 +4,8 @@ import { Component, ViewChild } from '@angular/core';
import { Router } from '@angular/router';
import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st';
import { SFComponent, SFSchema, SFDateWidgetSchema, SFUISchema } from '@delon/form';
import { ShipperBaseService } from '@shared';
import { isTemplateRef } from 'ng-zorro-antd/core/util';
import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalService } from 'ng-zorro-antd/modal';
import { delay } from 'rxjs/operators';
import { TicketService } from '../../services/ticket.service';
import { PrintOrderModalComponent } from './print-order-modal/print-order-modal.component';
@ -278,10 +276,14 @@ export class InvoiceRequestedComponent {
}
downloadPdf(item: any) {
this.service.request(this.service.$api_downloadPdf, { vatappHId: item.id }).subscribe(res => {
if (res?.reconciliationUrl) {
this.service.reviewPDF(res.reconciliationUrl);
if (item?.reconciliationUrl) {
this.service.reviewPDF(item.reconciliationUrl);
} else {
this.service
.request(this.service.$api_downloadPdf, { vatappHId: item.id })
.pipe(delay(3000))
.subscribe(res => {
if (res?.esignFlowId) {
this.service
.request(this.service.$api_download_Reconciliatio_pdf, { vatappHId: item.id, esignFlowId: res.esignFlowId })
.subscribe(rs => {
@ -290,11 +292,13 @@ export class InvoiceRequestedComponent {
} else {
// this.service.msgSrv.warning('获取对账单失败');
}
this.st.load(1);
});
// this.service.msgSrv.warning('获取对账单失败');
}
// this.service.msgSrv.warning('获取对账单失败');
});
}
}
/**
* 重置表单

20
src/app/routes/usercenter/components/freight/user/detail/detail.component.html
View File

@ -35,7 +35,7 @@
</button>
<button *ngIf="!userDetail?.stateLocked" [nzLoading]="service.http.loading" nz-button nzDanger nzGhost
(click)="userAction(0)" acl [acl-ability]="['USERCENTER-FREIGHT-USER-D-lock']">
冻结33
冻结
</button>
</div>
</div>
@ -80,7 +80,23 @@
<input nz-input type="text" [minlength]="18" [maxlength]="18" [(ngModel)]="userIdentityDetail.certificateNumber" [readonly]="!isEditUser"
[nzBorderless]="!isEditUser" [placeholder]="isEditUser?'':'-'">
</sv>
<sv label="身份证照">
<sv label="有效期" col="1">
<nz-date-picker [(ngModel)]="userIdentityDetail.validStartTime" [nzDisabled]="!isEditUser" nzPlaceHolder=" "
[nzBorderless]="!isEditUser" [nzSuffixIcon]="isEditUser?'calendar':''" style="width: 130px;" class="calendar">
</nz-date-picker>
-
<ng-container *ngIf="!isEditUser && !userIdentityDetail?.validEndTime && userIdentityDetail?.validStartTime">
<label style="padding-left: 11px;">长期</label>
</ng-container>
<nz-date-picker [(ngModel)]="userIdentityDetail.validEndTime" [nzDisabled]="!isEditUser" nzPlaceHolder=" "
[nzBorderless]="!isEditUser" [nzSuffixIcon]="isEditUser?'calendar':''" style="width: 130px;" class="calendar">
</nz-date-picker>
<ng-container *ngIf="isEditUser">
<label nz-checkbox [ngModel]="!!!userIdentityDetail.validEndTime"
(ngModelChange)="$event?userIdentityDetail.validEndTime='':''" class="ml-sm">长期</label>
</ng-container>
</sv>
<sv label="身份证照" col="1">
<div class="d-flex">
<ng-container
*ngTemplateOutlet="uploadTemplate;context:{data:userIdentityDetail,status:isEditUser,key:'certificatePhotoFrontWatermark',key2:'certificatePhotoFront',hover:'certificateBackFront'}">

13
src/app/routes/usercenter/components/freight/user/detail/detail.component.ts
View File

@ -3,7 +3,7 @@ import { ActivatedRoute } from '@angular/router';
import { apiConf } from '@conf/api.conf';
import { STColumn, STComponent } from '@delon/abc/st';
import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
import { ModalHelper, _HttpClient } from '@delon/theme';
import { ModalHelper, _HttpClient, DatePipe } from '@delon/theme';
import { NzImageService } from 'ng-zorro-antd/image';
import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalService } from 'ng-zorro-antd/modal';
@ -13,7 +13,8 @@ import { UsermanageService } from '../../../../services/usercenter.service';
@Component({
selector: 'app-supplier-components-list-view',
templateUrl: './detail.component.html',
styleUrls: ['./detail.component.less']
styleUrls: ['./detail.component.less'],
providers:[DatePipe]
})
export class FreightComponentsUserDetailComponent implements OnInit {
@ViewChild('redectModal', { static: false })
@ -39,7 +40,8 @@ export class FreightComponentsUserDetailComponent implements OnInit {
private nzModalService: NzModalService,
public service: UsermanageService,
public route: ActivatedRoute,
private nzImageService: NzImageService
private nzImageService: NzImageService,
private datePipe: DatePipe
) {}
ngOnInit() {
@ -155,6 +157,11 @@ export class FreightComponentsUserDetailComponent implements OnInit {
saveUser() {
const params = {...this.userIdentityDetail};
Object.assign(params, {
...this.userIdentityDetail,
validStartTime: this.datePipe.transform(this.userIdentityDetail?.validStartTime, 'yyyy-MM-dd'),
validEndTime: this.datePipe.transform(this.userIdentityDetail?.validEndTime, 'yyyy-MM-dd'),
});
this.service.request(this.service.$api_update_driver_identity, params).subscribe(res => {
if (res) {
this.service.msgSrv.success('修改成功');

2
src/app/routes/vehicle/components/list/detail/detail.component.ts
View File

@ -107,7 +107,7 @@ export class VehicleComponentsListDetailComponent implements OnInit {
{
text: '上传协议',
click: _record => this.updateEvaluate(_record),
iif: item => item.auditStatusEnum == -1
// iif: item => item.auditStatusEnum == -1
}
]
}

2
src/app/routes/vehicle/components/list/edit/edit.component.ts
View File

@ -100,7 +100,7 @@ export class VehicleComponentsListEditComponent implements OnInit {
};
this.ui = {
'*': {
spanLabelFixed: 120,
spanLabelFixed: 200,
grid: { span: 24 },
},
};

BIN
src/assets/images/road.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 23 KiB

4
src/assets/mocks/menu-data.json
View File

@ -702,6 +702,10 @@
{
"text": "税务申报",
"link": "/tax/declare"
},
{
"text": "发票上传",
"link": "/tax/invoiceReport"
}
]
}