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:
Taric Xin
2022-04-11 20:17:38 +08:00
parent 075fa637dc 87f2994e75
commit 29cdcd0294
14 changed files with 92 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts
View File

@ -556,7 +556,7 @@ export class DatatableOrderReportingComponent implements OnInit {
this.openWainingModal('请选择需要更新的数据');
return;
}
const ids = this.selectedRows.map(i => i?.id);
const ids = this.selectedRows.map(i => i?.orderId);
this.service.request(this.service.$api_update_order_data, ids).subscribe(res => {
if (res) {
this.service.msgSrv.success('更新成功');

2
src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html
View File

@ -6,7 +6,7 @@
</div>
<div style="width: 90%;">
<st #st [scroll]="{x:'1000px',y:'600px'}" [data]="service.$api_get_order_valid_result" [columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams ,process: beforeReq }"
[res]="{ reName: { list: 'data', total: 'data.total' } }" [page]="{ show: false,showSize:false}"
[bordered]="true">
<ng-template st-row="checkStatus" let-item>

14
src/app/routes/datatable/reporting/components/verify-result/verify-result.component.ts
View File

@ -1,6 +1,6 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { Router } from '@angular/router';
import { STColumn, STComponent } from '@delon/abc/st';
import { STColumn, STComponent, STRequestOptions } from '@delon/abc/st';
import { NzModalRef } from 'ng-zorro-antd/modal';
import { ReportingService } from '../../services/reporting.service';
@ -23,13 +23,21 @@ export class DatatableReportingVerifyResultComponent implements OnInit {
get reqParams() {
return {
subjectType: this.subjectType,
subjectId: this.record?.orderId
subjectId: this.record?.orderId,
};
}
constructor(public service: ReportingService, private modalRef: NzModalRef, public router: Router) {
}
beforeReq(requestOptions: STRequestOptions) {
delete requestOptions?.body?.pageSize;
delete requestOptions?.body?.pageIndex;
return requestOptions;
}
ngOnInit(): void {
this.initST();
}
@ -76,8 +84,8 @@ export class DatatableReportingVerifyResultComponent implements OnInit {
}
selectTab(e: any) {
this.subjectType = e?.value;
setTimeout(() => {
this.subjectType = e?.value;
this.st.load(1);
})
}

2
src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.html
View File

@ -32,7 +32,7 @@
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
<button nz-button (click)="resetSF()">重置</button>
<button nz-button> 导出</button>
<button nz-button (click)="exprot()"> 导出</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>

6
src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts
View File

@ -200,7 +200,7 @@ export class WithdrawalsRecordComponent {
type: 'string',
title: '账户名称',
ui: {
placeholder: '请输入',
placeholder: '请输入'
}
},
accountType: {
@ -302,4 +302,8 @@ export class WithdrawalsRecordComponent {
}
];
}
// 导出
exprot() {
this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_asyncExportRefundApplicationList);
}
}

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

@ -164,6 +164,8 @@ export class FreightAccountService extends ShipperBaseService {
$api_get_asyncExportBillRefundApplicationList = '/api/fcc/billRefundApplication/asyncExportBillRefundApplicationList';
// 异步导出运营后台支付记录列表
$api_get_asyncExportBillPaymentApplicationList = '/api/fcc/billPaymentApplicationOBC/asyncExportBillPaymentApplicationList';
// 异步导出运营后台提现记录
$api_get_asyncExportRefundApplicationList = '/api/fcc/refundApplicationOBC/asyncExportRefundApplicationList';
constructor(public injector: Injector) {
super(injector);

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

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-24 16:58:02
* @LastEditors : Shiming
* @LastEditTime : 2022-03-23 14:44:37
* @LastEditTime : 2022-04-11 19:26:19
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -589,6 +589,7 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
nzContent: AmapPoiPickerComponent,
nzWidth: 900,
nzOnOk: item => {
if(item?.poi) {
const poi = item.poi;
const locList = poi.pois;
switch (type) {
@ -620,7 +621,12 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
this.totalTime = res?.time;
});
}
return true
} else {
this.service.msgSrv.warning('请重新手动选择地址！')
return false
}
}
});
}
initSF3() {

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

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-23 13:39:58
* @LastEditors : Shiming
* @LastEditTime : 2022-04-06 15:12:24
* @LastEditTime : 2022-04-11 19:26:34
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail-change\\vehicle-detail-change.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -560,6 +560,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
nzContent: AmapPoiPickerComponent,
nzWidth: 900,
nzOnOk: item => {
if(item?.poi) {
const poi = item.poi;
const locList = poi.pois;
switch (type) {
@ -591,6 +592,11 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
this.totalTime = res?.time;
});
}
return true
} else {
this.service.msgSrv.warning('请重新手动选择地址！')
return false
}
}
});
}

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

@ -838,6 +838,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
nzContent: AmapPoiPickerComponent,
nzWidth: 900,
nzOnOk: item => {
if(item?.poi) {
const poi = item.poi;
const locList = poi.location.toString().split(',');
switch (type) {
@ -869,6 +870,11 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
this.totalTime = res.time;
});
}
return true
} else {
this.service.msgSrv.warning('请重新手动选择地址！')
return false
}
}
});
}

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

@ -725,6 +725,7 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit {
nzContent: AmapPoiPickerComponent,
nzWidth: 900,
nzOnOk: item => {
if(item?.poi) {
const poi = item.poi;
const locList = poi.pois;
switch (type) {
@ -753,6 +754,11 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit {
this.totalTime = res.time;
});
}
return true
} else {
this.service.msgSrv.warning('请重新手动选择地址！')
return false
}
}
});
}

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

@ -1080,37 +1080,44 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
nzContent: AmapPoiPickerComponent,
nzWidth: 900,
nzOnOk: item => {
const poi = item.poi;
const locList = poi.pois;
switch (type) {
case 'start':
this.startInfo[index].detailedAddress = poi.formattedAddress;
this.startInfo[index].longitude = locList[0];
this.startInfo[index].latitude = locList[1];
this.startInfo[index].province = poi.addressComponent.province;
this.startInfo[index].city = poi.addressComponent.city;
this.startInfo[index].area = poi.addressComponent.district;
this.startInfo[index].address = poi.formattedAddress;
break;
case 'end':
this.endInfo[index].detailedAddress = poi.formattedAddress;
this.endInfo[index].longitude = locList[0];
this.endInfo[index].latitude = locList[1];
this.endInfo[index].province = poi.addressComponent.province;
this.endInfo[index].city = poi.addressComponent.city;
this.endInfo[index].area = poi.addressComponent.district;
this.endInfo[index].address = poi.formattedAddress;
break;
default:
break;
}
console.log(item);
if(item?.poi) {
const poi = item.poi;
const locList = poi.pois;
switch (type) {
case 'start':
this.startInfo[index].detailedAddress = poi.formattedAddress;
this.startInfo[index].longitude = locList[0];
this.startInfo[index].latitude = locList[1];
this.startInfo[index].province = poi.addressComponent.province;
this.startInfo[index].city = poi.addressComponent.city;
this.startInfo[index].area = poi.addressComponent.district;
this.startInfo[index].address = poi.formattedAddress;
break;
case 'end':
this.endInfo[index].detailedAddress = poi.formattedAddress;
this.endInfo[index].longitude = locList[0];
this.endInfo[index].latitude = locList[1];
this.endInfo[index].province = poi.addressComponent.province;
this.endInfo[index].city = poi.addressComponent.city;
this.endInfo[index].area = poi.addressComponent.district;
this.endInfo[index].address = poi.formattedAddress;
break;
default:
break;
}
if (this.startInfo[0]?.area && this.endInfo[0]?.area) {
this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe((res: any) => {
this.totalDistance = res.distance;
this.totalTime = res.time;
this.getInsurersPrice(); // 计算保费金额
});
if (this.startInfo[0]?.area && this.endInfo[0]?.area) {
this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe((res: any) => {
this.totalDistance = res.distance;
this.totalTime = res.time;
this.getInsurersPrice(); // 计算保费金额
});
}
return true
} else {
this.service.msgSrv.warning('请重新手动选择地址！')
return false
}
}
});

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

@ -999,6 +999,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
nzContent: AmapPoiPickerComponent,
nzWidth: 900,
nzOnOk: item => {
if(item?.poi) {
const poi = item.poi;
const locList = poi.pois;
switch (type) {
@ -1029,6 +1030,11 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
this.getInsurersPrice(); // 计算保费金额
});
}
return true
} else {
this.service.msgSrv.warning('请重新手动选择地址！')
return false
}
}
});
}

3
src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts
View File

@ -129,9 +129,6 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
widget: 'sl-from-to',
type: 'date',
format: 'yyyy-MM-dd',
visibleIf: {
_$expand: (value: boolean) => value
}
} as SFDateWidgetSchema
},
sbrq: {

2
src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts
View File

@ -329,7 +329,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
}
let params: any[] = [];
this.selectedRows.forEach(item => {
params.push(item.id);
params.push(item.billId);
});
this.service.request(this.service.$api_get_renewalOrderById, params).subscribe((res: any) => {
if (res) {