Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

This commit is contained in:
Taric Xin
2022-04-12 15:44:10 +08:00
6 changed files with 50 additions and 16 deletions

View File

@ -119,7 +119,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
searchLoadingText: '搜索中...',
allowClear: true,
onSearch: (q: any) => {
let str =q.replace(/^\s+|\s+$/g,"");
let str = q.replace(/^\s+|\s+$/g, "");
if (str) {
return this.service
.request(this.service.$api_enterpriceList, { enterpriseName: str })
@ -129,7 +129,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
return of([]);
}
},
} as SFSelectWidgetSchema
},
driverName: {
@ -262,7 +262,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
{ title: '货主名称', index: 'shipperName', className: 'text-center', width: '180px' },
{ title: '货主纳税人识别号', index: 'shipperProvinceCode', className: 'text-center', width: '180px' },
{ title: '录单时间', index: 'billCreateTime', className: 'text-center', width: '250px' },
{ title: '接单时间', index: 'wayBillCreateTime', className: 'text-center', width: '200px' },
{ title: '接单时间', index: 'wayBillCreateTime', className: 'text-center', width: '200px' },
{ title: '发车时间', index: 'loadTime', className: 'text-center', width: '200px' },
{ title: '到车时间', index: 'unloadTime', className: 'text-center', width: '150px' },
{ title: '结束时间', index: 'payeeName', className: 'text-center', width: '150px' },
@ -308,7 +308,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
nzOkText: '确定',
nzCancelText: '取消',
nzOnOk: () => {
this.service.request(this.service.$api_get_recessionTaxOrder,params).subscribe((res: any) => {
this.service.request(this.service.$api_get_recessionTaxOrder, params).subscribe((res: any) => {
if (res) {
this.service.msgSrv.success('撤销成功');
this.search();
@ -371,7 +371,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
selectChange(item: any) {
console.log(item);
this.selectedIndex = item?.value || '';
setTimeout(() => {
this.st.load();
@ -499,5 +499,4 @@ export class TaxManagementOrderReportingComponent implements OnInit {
})
}
}