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-06 14:32:22 +08:00
parent 72d9cd0f42 55bd97f7f6
commit fa25714764
29 changed files with 103 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
proxy.conf.js
View File

@ -20,17 +20,7 @@ module.exports = {
// }
'//api': {
target: {
host: 'tms-api-dev.eascs.com',
protocol: 'https:',
port: 443
},
secure: false,
changeOrigin: true,
logLevel: 'debug'
},
'//sascs': {
target: {
host: 'sascs-tj-tms-dev.obs.cn-south-1.myhuaweicloud.com',
host: 'tms-api-test.eascs.com',
protocol: 'https:',
port: 443
},

2
src/app/routes/datatable/components/busitable/busiindex/busiindex.component.html
View File

@ -21,7 +21,7 @@
<st #st multiSort [columns]="columns" [ps]="20" [data]="service.$api_listPerformanceReportPage"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[scroll]="{ x: '1200px' }" [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }" [loading]="service.http.loading"></st>
[page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }"></st>
</nz-card>
<nz-card nzTitle="业绩报表" [nzExtra]="extraTemplate01">
<ng-template #extraTemplate01>

12
src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts
View File

@ -25,10 +25,9 @@ export class DatatableBusiindexComponent implements OnInit {
dateNext: any = null;
modeNext = 'year';
timeNext: any = ['2022-01-01 00:00:00']
dateFormat = 'yyyy-MM-dd';
dateFormat = 'yyyy';
today = new Date();
chartData: any = {}
flag = false;
columns: STColumn[] = [
{ title: '运营主体', index: 'networkTransporterName', className: 'text-center' },
@ -67,7 +66,7 @@ export class DatatableBusiindexComponent implements OnInit {
ngOnInit(): void {
this.initData()
}
initData(){
initData(flag?: boolean){
let type = 1
if(this.mode === 'year') {
type = 1
@ -81,7 +80,7 @@ export class DatatableBusiindexComponent implements OnInit {
this.service.request(this.service.$api_performanceReportHistogram, params).subscribe(res => {
if (res) {
this.chartData = res
if(this.flag) {
if(flag) {
this.pillar.reRender()
this.curve.reRender()
}
@ -126,10 +125,7 @@ export class DatatableBusiindexComponent implements OnInit {
} else if(this.mode === 'month') {
this.timeNext = [this.datePipe.transform(this.dateNext, 'yyyy-MM') + '-01 00:00:00']
}
this.flag = true
this.initData()
this.initData(true)
}
disabledDate = (current: Date): boolean =>
// Can not select days before today and today

6
src/app/routes/datatable/components/busitable/busiindex/curve/curve.component.ts
View File

@ -26,16 +26,14 @@ export class BusitableCurveComponent implements OnInit, OnChanges {
}
reRender() {
setTimeout(() => {
this.chart.data(this.chartData);
this.chart.render();
}, 500)
}
render(el: ElementRef<HTMLDivElement>): void {
this.el = el.nativeElement
if(!this.service.http.loading){
setTimeout(() => {
this.ngZone.runOutsideAngular(() => this.init(this.el));
}
}, 500)
}
private init(el: HTMLElement): void {

2
src/app/routes/datatable/components/busitable/mantable/mantable.component.ts
View File

@ -20,7 +20,7 @@ export class DatatableMantableComponent implements OnInit {
date: any = null;
defineDate = [];
time: any = ['2022-01-01 00:00:00']
dateFormat = 'yyyy-MM-dd';
dateFormat = 'yyyy';
today = new Date();
dateNext: any = null;
modeNext = 'year';

6
src/app/routes/datatable/components/busitable/pillar/pillar.component.ts
View File

@ -26,14 +26,14 @@ export class BusitablePillarComponent implements OnInit, OnChanges {
}
reRender() {
setTimeout(() => {
this.chart.data(this.chartData);
this.chart.render();
}, 500)
}
render(el: ElementRef<HTMLDivElement>): void {
this.el = el.nativeElement
this.ngZone.runOutsideAngular(() => this.init(this.el));
setTimeout(() => {
this.ngZone.runOutsideAngular(() => this.init(this.el));
}, 500)
}
private init(el: HTMLElement): void {

2
src/app/routes/datatable/components/customtable/customindex/customindex.component.html
View File

@ -39,7 +39,7 @@
<st #st multiSort [columns]="columns" [ps]="20" [data]="service.$api_listOperationalReportPage"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[scroll]="{ x: '1200px' }" [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }" [loading]="service.http.loading"></st>
[page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }"></st>
</nz-card>
<nz-card nzTitle="用户新增报表" [nzExtra]="extraTemplate">
<ng-template #extraTemplate01>

2
src/app/routes/datatable/components/customtable/customindex/customindex.component.ts
View File

@ -20,7 +20,7 @@ export class DatatableCustomindexComponent implements OnInit {
date: any = null;
defineDate = [];
time: any = ['2022-01-01 00:00:00']
dateFormat = 'yyyy-MM-dd';
dateFormat = 'yyyy';
today = new Date();
dateNext: any = null;
modeNext = 'year';

2
src/app/routes/datatable/components/customtable/driver/driver.component.html
View File

@ -41,6 +41,6 @@
<st #st multiSort [columns]="columns" [ps]="20" [data]="service.$api_listDriverReportPage"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[scroll]="{ x: '1200px' }" [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }" [loading]="service.http.loading">
[page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }">
</st>
</nz-card>

2
src/app/routes/datatable/components/customtable/driver/driver.component.ts
View File

@ -20,7 +20,7 @@ export class DatatableDriverComponent implements OnInit {
date: any = null;
defineDate = [];
queryTime: any = ''
dateFormat = 'yyyy-MM-dd';
dateFormat = 'yyyy';
today = new Date();
ui: SFUISchema = {};
schema: SFSchema = {};

2
src/app/routes/datatable/components/customtable/owner/owner.component.html
View File

@ -41,6 +41,6 @@
<st #st multiSort [columns]="columns" [ps]="20" [data]="service.$api_listShipperReportPage"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[scroll]="{ x: '1200px' }" [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }" [loading]="service.http.loading">>
[page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }">
</st>
</nz-card>

2
src/app/routes/datatable/components/customtable/owner/owner.component.ts
View File

@ -20,7 +20,7 @@ export class DatatableOwnerComponent implements OnInit {
date: any = null;
defineDate = [];
time: any = ['2022-01-01 00:00:00']
dateFormat = 'yyyy-MM-dd';
dateFormat = 'yyyy';
today = new Date();
ui: SFUISchema = {};
schema: SFSchema = {};

2
src/app/routes/datatable/components/customtable/partnertable/partnertable.component.html
View File

@ -37,7 +37,7 @@
<st #st multiSort bordered [data]="service.$api_listOperationalReportPage" [columns]="columns" [ps]="20"
[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: [20, 50, 100] }" [loading]="service.http.loading">
[page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }">
</st>
</nz-card>

2
src/app/routes/datatable/components/financetable/financetable.component.ts
View File

@ -24,7 +24,7 @@ export class DatatableFinancetableComponent implements OnInit {
date: any = null;
defineDate = [];
time: any = ['2022-01-01 00:00:00']
dateFormat = 'yyyy-MM-dd';
dateFormat = 'yyyy';
dateNext: any = null;
modeNext = 'year';
timeNext: any = ['2022-01-01 00:00:00']

4
src/app/routes/datatable/components/operationtable/curve/curve.component.ts
View File

@ -33,9 +33,9 @@ export class OperationCurveComponent implements OnInit, OnChanges {
}
render(el: ElementRef<HTMLDivElement>): void {
this.el = el.nativeElement
if(!this.service.http.loading){
setTimeout(() => {
this.ngZone.runOutsideAngular(() => this.init(this.el));
}
},500)
}
private init(el: HTMLElement): void {

7
src/app/routes/datatable/components/operationtable/operationtable.component.ts
View File

@ -22,7 +22,7 @@ export class DatatableOperationtableComponent implements OnInit {
date: any = null;
defineDate = [];
time: any = ['2022-01-01 00:00:00']
dateFormat = 'yyyy-MM-dd';
dateFormat = 'yyyy';
dateNext: any = null;
modeNext = 'year';
timeNext: any = ['2022-01-01 00:00:00']
@ -31,7 +31,6 @@ export class DatatableOperationtableComponent implements OnInit {
interManlist: any = []
chartData: any = {}
flag: boolean = false;
columns: STColumn[] = [
{ title: '运营主体', index: 'networkTransporterName', className: 'text-center' },
{ title: '订单数', index: 'zsl', className: 'text-center' },
@ -84,11 +83,10 @@ export class DatatableOperationtableComponent implements OnInit {
type,
enterpriseInfoId: this.enterpriseInfoId
};
this.flag = flag ? flag : false
this.service.request(this.service.$api_operationalReportHistogram, params).subscribe(res => {
if (res) {
this.chartData = res
if(this.flag) {
if(flag) { // 除第一次加载外
this.pillar.reRender()
this.curve.reRender()
}
@ -152,5 +150,6 @@ export class DatatableOperationtableComponent implements OnInit {
} else if(this.mode === 'month') {
this.timeNext = [this.datePipe.transform(this.dateNext, 'yyyy-MM') + '-01 00:00:00']
}
this.initPillarData(true)
}
}

6
src/app/routes/datatable/components/operationtable/pillar/pillar.component.ts
View File

@ -33,9 +33,9 @@ export class OperationPillarComponent implements OnInit, OnChanges {
}
render(el: ElementRef<HTMLDivElement>): void {
this.el = el.nativeElement
if(!this.service.http.loading){
this.ngZone.runOutsideAngular(() => this.init(this.el));
}
setTimeout(() => {
this.ngZone.runOutsideAngular(() => this.init(this.el));
}, 500)
}
private init(el: HTMLElement): void {

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

@ -22,13 +22,13 @@ import { DatatableBusiindexComponent } from './components/busitable/busiindex/bu
import { DatatableMantableComponent } from './components/busitable/mantable/mantable.component';
import { BusitablePillarComponent } from './components/busitable/pillar/pillar.component';
import { DatatableReportingFundInfoComponent } from './reporting/components/fund-info/fund-info.component';
import { BusitableCurveComponent } from './components/busitable/busiindex/curve/curve.component';
import { OperationPillarComponent } from './components/operationtable/pillar/pillar.component';
import { OperationCurveComponent } from './components/operationtable/curve/curve.component';
import { FinanceTableCurveComponent } from './components/financetable/curve/curve.component';
import { DatatableDatascreenComponent } from './components/datascreen/datascreen.component';
import { FinancetablePillarComponent } from './components/financetable/pillar/pillar.component';
import { ComplianceCurveComponent } from './components/compliance/index/curve/curve.component';
import { BusitableCurveComponent } from './components/busitable/busiindex/curve/curve.component';
const COMPONENTS: Type<void>[] = [
DatatableDataindexComponent,
@ -53,14 +53,14 @@ const COMPONENTS: Type<void>[] = [
BusitablePillarComponent,
DatatableFundReportingComponent,
DatatableReportingFundInfoComponent,
BusitableCurveComponent,
OperationPillarComponent,
OperationCurveComponent,
DatatableReportingFundInfoComponent,
FinanceTableCurveComponent,
DatatableDatascreenComponent,
FinancetablePillarComponent,
ComplianceCurveComponent
ComplianceCurveComponent,
BusitableCurveComponent
]

2
src/app/routes/financial-management/components/driver-account/driver-account.component.ts
View File

@ -74,7 +74,7 @@ export class DriverAccountComponent implements OnInit {
}
exportList() {
this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageSize: -1 });
this.service.asyncExport({ ...this.sf.value, pageSize: -1 }, this.service.$api_export_driver_account_page);
}
private initSF(): SFSchema {

38
src/app/routes/financial-management/services/freight-account.service.ts
View File

@ -39,6 +39,8 @@ export class FreightAccountService extends ShipperBaseService {
$api_get_shipper_account_balance_detail = '/api/fcc/accountBalanceDetail/getAccountBalanceShipperIncomeDetailByOperator';
// 运营端端获取司机交易收入与支出金额
$api_get_driver_account_balance_detail = '/api/fcc/accountBalanceDetail/getAccountBalanceDriverIncomeDetailByOperator';
// 运营端导出司机账户明细信息
$api_export_driver_account_page = '/api/fcc/accountBalance/exportDriverAccountBalanceByOperator';
// 货主端获取账户余额交易明细
$api_get_balance_by_shipper = '/api/fcc/accountBalanceDetail/getAccountBalanceByShipperPage';
@ -59,14 +61,14 @@ export class FreightAccountService extends ShipperBaseService {
// 拒绝提现
$api_disagree_refund = '/api/fcc/refundApplicationOBC/disagreeRefund';
// 查询订单退款申请表
$api_get_refund_record_page = '/api/fcc/billRefundApplication/list/page';
// 同意退款
$api_agree_refund_record= '/api/fcc/billRefundApplication/agreeRefund';
// 不同意退款
$api_disagree_refund_record = '/api/fcc/billRefundApplication/disagreeRefund';
// 重新发起
$api_rebulid_refund_record = '/api/fcc/billRefundApplication/rebulid';
// 查询订单退款申请表
$api_get_refund_record_page = '/api/fcc/billRefundApplication/list/page';
// 同意退款
$api_agree_refund_record = '/api/fcc/billRefundApplication/agreeRefund';
// 不同意退款
$api_disagree_refund_record = '/api/fcc/billRefundApplication/disagreeRefund';
// 重新发起
$api_rebulid_refund_record = '/api/fcc/billRefundApplication/rebulid';
// 查询充值信息表
$api_get_recharge_page = '/api/fcc/rechargeInfo/list/getPageByOperator';
@ -122,6 +124,7 @@ export class FreightAccountService extends ShipperBaseService {
// 下载银行回单请求
$api_download_receipt_apply = '/api/fcc/spd/callback/receiptApply';
$api_download_receipt_apply_byte = '/api/fcc/spd/callback/receiptApplyByte';
// 查询预收款余额
$api_get_advance_collection_page = '/api/fcc/ficoYskBla/list/page';
@ -137,12 +140,25 @@ export class FreightAccountService extends ShipperBaseService {
}
getReceiptUrl(url: string, params: any) {
const { bankType, snglFlgCd } = params;
if (url) {
this.reviewPDF(url);
if (params?.bankType === '1') {
window.open(params?.receiptUrl);
} else if (params?.bankType === '2') {
this.exportFile({ bankType, receiptUrl: url, bankSerialNumber: snglFlgCd }, this.$api_download_receipt_apply_byte);
}
} else {
this.request(this.$api_download_receipt_apply, { ...params }).subscribe(res => {
if (res?.receiptUrl) {
this.reviewPDF(res.receiptUrl);
if (bankType === '1') {
window.open(res?.receiptUrl);
} else if (bankType === '2') {
this.downloadFile(this.$api_download_receipt_apply_byte, {
bankType,
receiptUrl: res.receiptUrl,
bankSerialNumber: snglFlgCd
});
}
} else {
this.msgSrv.warning(res.statusMsg || '获取回单失败');
}
@ -163,7 +179,7 @@ export class FreightAccountService extends ShipperBaseService {
const a = document.createElement('a');
document.body.appendChild(a);
a.href = objectUrl;
a.download = '回单.pdf';
a.download = `回单.pdf`;
if (isIE) {
// 兼容IE11无法触发下载的问题
(navigator as any).msSaveBlob(url, a.download);

4
src/app/routes/logs/components/system-logs/system-logs.component.ts
View File

@ -52,7 +52,7 @@ export class SystemLogsComponent implements OnInit {
}
},
time: {
title: '登录时间',
title: '操作时间',
type: 'string',
ui: {
widget: 'sl-from-to-search',
@ -67,7 +67,7 @@ export class SystemLogsComponent implements OnInit {
};
columns: STColumn[] = [
{ title: '操作时间', index: 'operatorTimestamp', type: 'date' },
{ title: '操作时间', index: 'operatorTimestamp' },
{ title: '操作人', index: 'operator' },
{ title: '操作人手机号码', index: 'telephone' },
{ title: '操作页面', index: 'operatePage' },

2
src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html
View File

@ -41,7 +41,7 @@
[acl-ability]="['ORDER-COMPLIANCE-AUDIT-search']"
>查询</button
>
<button nz-button nzType="primary" [disabled]="false" acl [acl-ability]="['ORDER-COMPLIANCE-AUDIT-export']"
<button nz-button nzType="primary" [disabled]="false" acl [acl-ability]="['ORDER-COMPLIANCE-AUDIT-export']" (click)="exprot()"
>导出</button
>
<button nz-button [disabled]="false" (click)="resetSF()">重置</button>

8
src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts
View File

@ -694,4 +694,12 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
}
}
}
// 导出
exprot() {
this.service.request(this.service.$api_get_asyncExportSpotCheckList, this.reqParams).subscribe((res: any) => {
if (res) {
this.service.msgSrv.success('导出成功，请去下载中心下载！');
}
});
}
}

4
src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming
* @LastEditTime : 2022-04-01 11:00:38
* @LastEditTime : 2022-04-06 11:06:05
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\receipts-audit\\receipts-audit.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -35,7 +35,7 @@
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()" acl [acl-ability]="['ORDER-RECEIPTS-search']"
>查询</button
>
<button nz-button nzType="primary" [disabled]="false">导出</button>
<button nz-button nzType="primary" [disabled]="false" (click)="exprot()">导出</button>
<button nz-button [disabled]="false" (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}

8
src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts
View File

@ -576,4 +576,12 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
// }
});
}
// 导出
exprot() {
this.service.request(this.service.$api_get_asyncExportExamineBillList, this.reqParams).subscribe((res: any) => {
if (res) {
this.service.msgSrv.success('导出成功，请去下载中心下载！');
}
});
}
}

6
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-02 13:10:13
* @LastEditTime : 2022-04-06 11:03:58
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\services\\order-management.service.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -193,6 +193,10 @@ export class OrderManagementService extends ShipperBaseService {
$api_get_asyncExportWholeList = `/api/sdc/billOperate/asyncExportWholeList`;
// 异步导出风险单导出
$api_get_asyncExportRiskBillList = `/api/sdc/billRiskOperate/asyncExportRiskBillList`;
// 异步导出合规抽查导出
$api_get_asyncExportSpotCheckList= `/api/sdc/BillComplianceSpotCheck/asyncExportSpotCheckList`;
// 异步导出单据审核导出
$api_get_asyncExportExamineBillList= `/api/sdc/billExamine/asyncExportExamineBillList`;
/**
* 根据企业ID，获取企业历史网络货运人
* @returns

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

@ -212,7 +212,14 @@ export class InvoiceRequestedComponent {
label: '手工处理',
onClick: () => {
const params = {
ficoVatappBillVOList: this.selectedRows
ficoVatappBillVOList: this.selectedRows.map(item => {
const i = Object.assign({}, { ...item });
delete i._values;
delete i._rowClassName;
delete i.checked;
delete i.disabled;
return i;
})
// id: this.id
};
this.service.request(this.service.$api_get_applyBatchFicoVatinv, params).subscribe((res: any) => {
@ -229,7 +236,14 @@ export class InvoiceRequestedComponent {
label: '自动开票',
onClick: () => {
const params = {
ficoVatappBillVOList: this.selectedRows
ficoVatappBillVOList: this.selectedRows.map(item => {
const i = Object.assign({}, { ...item });
delete i._values;
delete i._rowClassName;
delete i.checked;
delete i.disabled;
return i;
})
// id: this.id
};
this.service.request(this.service.$api_get_applyBatchFicoVatinv, params).subscribe((res: any) => {

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

@ -75,7 +75,7 @@ export class TicketService extends ShipperBaseService {
// 获取分票发票明细
$api_get_invoice_details = '/api/fcc/ficoVatinvL/getDetailByVatinvHId';
// 运营端订单明细开票处理
$api_get_applyFicoVatinv = '/api/fcc/ficoVatinvH/applyBatchFicoVatinv';
$api_get_applyFicoVatinv = '/api/fcc/ficoVatinvH/applyFicoVatinv';
// 开票申请列表批量开票
$api_get_applyBatchFicoVatinv = '/api/fcc/ficoVatinvH/applyBatchFicoVatinv';
// 删除销项发票抬头

2
src/app/shared/components/amap/amap.service.ts
View File

@ -74,7 +74,7 @@ export class AmapService {
if (status == 'complete') {
this.currentSub.next(result);
} else {
console.log('定位获取失败');
console.log('定位获取失败', result);
}
});
});