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:
heqinghang
2022-03-29 17:59:01 +08:00
parent b91095ed9a 28087d6363
commit bd55b5fd74
37 changed files with 1020 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
proxy.conf.js
View File

@ -20,7 +20,7 @@ module.exports = {
// }
'//api': {
target: {
host: 'tms-api-test.eascs.com',
host: 'tms-api-dev.eascs.com',
protocol: 'https:',
port: 443
},

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

@ -244,7 +244,7 @@ export class ContractManagementTemplateFrameComponent implements OnInit {
this.service.request(this.service.$api_deletebatch_contractTemplate, [value.id]).subscribe(res => {
if (res) {
this.service.msgSrv.success('删除成功！');
this.st.reload(1)
this.st.reload()
}
})
});

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

@ -244,7 +244,7 @@ export class ContractManagementTemplatePartnerComponent implements OnInit {
this.service.request(this.service.$api_deletebatch_contractTemplate, [value.id]).subscribe(res => {
if (res) {
this.service.msgSrv.success('删除成功！');
this.st.reload(1)
this.st.reload()
}
})
});

3
src/app/routes/datatable/datatable-routing.module.ts
View File

@ -12,6 +12,7 @@ import { DatatableFinancetableComponent } from './components/financetable/financ
import { DatatableInvoicetableComponent } from './components/invoicetable/invoicetable.component';
import { DatatableComplianceSalesmanComponent } from './components/compliance/salesman/salesman.component';
import { DatatableComplianceCustomerComponent } from './components/compliance/customer/customer.component';
import { DatatableFundReportingComponent } from './reporting/components/fund-reporting/fund-reporting.component';
const routes: Routes = [
{ path: 'dataindex', component: DatatableDataindexComponent },
@ -26,8 +27,10 @@ const routes: Routes = [
{ path: 'compliancetabel/customer', component: DatatableComplianceCustomerComponent },
{ path: 'financetable', component: DatatableFinancetableComponent },
{ path: 'invoicetable', component: DatatableInvoicetableComponent },
{ path: 'reporting/fund', component: DatatableFundReportingComponent }
];
@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule]

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

@ -14,6 +14,9 @@ import { DatatableFinancetableComponent } from './components/financetable/financ
import { DatatableInvoicetableComponent } from './components/invoicetable/invoicetable.component';
import { DatatableComplianceSalesmanComponent } from './components/compliance/salesman/salesman.component';
import { DatatableComplianceCustomerComponent } from './components/compliance/customer/customer.component';
import { DatatableReportingUploadSettingComponent } from './reporting/components/upload-setting/upload-setting.component';
import { DatatableReportingVerifyResultComponent } from './reporting/components/verify-result/verify-result.component';
import { DatatableFundReportingComponent } from './reporting/components/fund-reporting/fund-reporting.component';
const COMPONENTS: Type<void>[] = [
DatatableDataindexComponent,
@ -28,9 +31,13 @@ const COMPONENTS: Type<void>[] = [
DatatableFinancetableComponent,
DatatableInvoicetableComponent,
DatatableComplianceSalesmanComponent,
DatatableComplianceCustomerComponent
DatatableComplianceCustomerComponent,
DatatableReportingUploadSettingComponent,
DatatableReportingVerifyResultComponent,
DatatableFundReportingComponent
]
@NgModule({
imports: [
SharedModule,

57
src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html Normal file
View File

@ -0,0 +1,57 @@
<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]="false" (click)="search()" acl
[acl-ability]="['RiskOrder-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_order_reporting_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]="false">
<ng-template st-row="orderStatus" let-item let-index="index">
<a (click)="viewAuditResult(item)" *ngIf="item?.billStatus === '2'">{{item?.billStatusLabel}}</a>
<span *ngIf="item?.billStatus !== '2'">{{item?.billStatusLabel}}</span>
</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="amount" let-item let-index="index">
<div class="text-right">{{item?.amount | 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 nz-button nzType="primary" (click)="upload()">上传</button>
<button nz-button nzType="primary" (click)="recall()">撤回</button>
<button nz-button nzType="primary" (click)="uploadSetting()">上传设置</button>
</div>
</ng-template>

5
src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.less Normal file
View File

@ -0,0 +1,5 @@
:host {
.text-black {
color: #000;
}
}

24
src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.spec.ts Normal file
View File

@ -0,0 +1,24 @@
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { DatatableFundReportingComponent } from './fund-reporting.component';
describe('DatatableFundReportingComponent', () => {
let component: DatatableFundReportingComponent;
let fixture: ComponentFixture<DatatableFundReportingComponent>;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [DatatableFundReportingComponent]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(DatatableFundReportingComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

445
src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts Normal file
View File

@ -0,0 +1,445 @@
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, SFUISchema } from '@delon/form';
import { ShipperBaseService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
import { ReportingService } from '../../services/reporting.service';
import { DatatableReportingUploadSettingComponent } from '../upload-setting/upload-setting.component';
import { DatatableReportingVerifyResultComponent } from '../verify-result/verify-result.component';
@Component({
selector: 'app-datatable-fund-reporting',
templateUrl: './fund-reporting.component.html',
styleUrls: ['./fund-reporting.component.less']
})
export class DatatableFundReportingComponent implements OnInit {
_$expand = false;
ui!: SFUISchema;
schema!: SFSchema;
columns!: STColumn[];
@ViewChild('st', { static: false }) st!: STComponent;
@ViewChild('sf', { static: false }) sf!: SFComponent;
tabType!: string;
tabs: any[] = [
{ name: '待上传', value: '1' },
{ name: '上传中', value: '2' },
{ name: '已上传', value: '3' },
{ name: '异常', value: '4' },
{ name: '全部', value: '' }
];
selectedIndex = ''; //选择的项目
serviceTel = '';
constructor(
public service: ReportingService,
private router: Router,
private ar: ActivatedRoute,
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 || {}, {
representationsStatus: 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;
}
/**
* 程序初始化入口
*/
ngOnInit() {
this.initSF();
this.initST();
}
/**
* 初始化查询表单
*/
initSF() {
this.schema = {
properties: {
_$expand: { type: 'boolean', ui: { hidden: true } },
billCode: { title: '订单号', type: 'string', ui: { placeholder: '请输入' } },
resourceCode: {
type: 'string',
title: '运单号',
ui: {
placeholder: '请输入',
},
},
enterpriseInfoId: {
title: '网络货运人',
type: 'string',
ui: {
placeholder: '请选择',
widget: 'select',
asyncData: () => this.shipperSrv.getNetworkFreightForwarder({}, false),
allowClear: true
}
},
externalResourceCode: {
title: '货主',
type: 'string',
ui: {
placeholder: '请输入',
visibleIf: {
_$expand: (value: boolean) => value,
},
}
},
driverName: {
title: '承运司机',
type: 'string',
ui: {
placeholder: '请输入司机姓名/手机号', visibleIf: {
_$expand: (value: boolean) => value,
},
}
},
carNo: {
title: '车牌号',
type: 'string',
maxLength: 9,
ui: {
placeholder: '请输入',
visibleIf: {
_$expand: (value: boolean) => value,
},
}
},
serviceType: {
title: '上传状态',
type: 'string',
ui: {
placeholder: '请选择',
widget: 'dict-select',
params: { dictKey: 'service:type' },
containsAllLabel: true,
visibleIf: {
_$expand: (value: boolean) => value,
},
}
},
serviceType1: {
title: '本地校验',
type: 'string',
ui: {
placeholder: '请选择',
widget: 'dict-select',
params: { dictKey: 'service:type' },
containsAllLabel: true,
visibleIf: {
_$expand: (value: boolean) => value,
},
}
},
createTime: {
title: '上传时间',
type: 'string',
ui: {
widget: 'sl-from-to',
type: 'date',
format: 'yyyy-MM-dd',
visibleIf: {
_$expand: (value: boolean) => value,
},
} as SFDateWidgetSchema,
},
createTime1: {
title: '运单生成时间',
type: 'string',
ui: {
widget: 'sl-from-to',
type: 'date',
format: 'yyyy-MM-dd',
visibleIf: {
_$expand: (value: boolean) => value,
},
} as SFDateWidgetSchema,
},
createTime2: {
title: '发货时间',
type: 'string',
ui: {
widget: 'sl-from-to',
type: 'date',
format: 'yyyy-MM-dd',
visibleIf: {
_$expand: (value: boolean) => value,
},
} as SFDateWidgetSchema,
},
createTime3: {
title: '收货时间',
type: 'string',
ui: {
widget: 'sl-from-to',
type: 'date',
format: 'yyyy-MM-dd',
visibleIf: {
_$expand: (value: boolean) => value,
},
} as SFDateWidgetSchema,
},
loadingPlace: {
title: '车辆轨迹',
type: 'string',
enum: [
{ label: '全部', value: '' },
{ label: '有', value: '1' },
{ label: '无', value: '0' }
],
ui: {
placeholder: '请选择',
widget: 'select',
visibleIf: {
_$expand: (value: boolean) => value,
},
}
},
loadingPlace1: {
title: '司机轨迹',
type: 'string',
enum: [
{ label: '全部', value: '' },
{ label: '有', value: '1' },
{ label: '无', value: '0' }
],
ui: {
placeholder: '请选择',
widget: 'select',
visibleIf: {
_$expand: (value: boolean) => value,
},
}
},
},
};
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: 'orderStatus', className: 'text-center', width: '120px', },
{ title: '司机状态', render: 'driverStatus', className: 'text-center', width: '120px', },
{ title: '车辆状态', render: 'carStatus', className: 'text-center', width: '120px', },
{ title: '本地校验', render: 'localValid', className: 'text-center', width: '120px', },
{
title: '订单号',
render: 'billComplianceVOS',
className: 'text-center',
width: '150px',
},
{ title: '运单号', render: 'freightDetails', className: 'text-center', width: '150px', },
{
title: '网络货运人',
render: 'serviceType',
className: 'text-center',
width: '180px',
},
{ title: '统一社会信用代码', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
{ title: '业务类型', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '120px' },
{ title: '运单生成时间', render: 'goodsInfoVOList', className: 'text-center', width: '180px' },
{ title: '发货时间', render: 'driver', className: 'text-center', width: '180px' },
{ title: '收货时间', render: 'payeeName', className: 'text-center', width: '180px' },
{ title: '托运人名称', render: 'transportInfo', className: 'text-center', width: '250px' },
{ title: '托运人统一社会信用代码', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
{ title: '装货地址', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '200px' },
{ title: '收货方名称', render: 'driver', className: 'text-center', width: '150px' },
{ title: '收货地址', render: 'payeeName', className: 'text-center', width: '150px' },
{ title: '运费金额', render: 'amount', className: 'text-center', width: '250px' },
{ title: '车牌号', render: 'payeeName', className: 'text-center', width: '150px' },
{ title: '车牌颜色', render: 'transportInfo', className: 'text-center', width: '250px' },
{ title: '司机姓名', render: 'payeeName', className: 'text-center', width: '150px' },
{ title: '司机手机号码', render: 'transportInfo', className: 'text-center', width: '200px' },
{ title: '司机身份证号', render: 'payeeName', className: 'text-center', width: '150px' },
{ title: '货物信息', render: 'transportInfo', className: 'text-center', width: '180px' },
{ title: '实际承运人名称', render: 'payeeName', className: 'text-center', width: '150px' },
{ title: '实际承运人证件号码', render: 'transportInfo', className: 'text-center', width: '200px' },
{ title: '实际承运人道路运输许可证号', render: 'payeeName', className: 'text-center', width: '150px' },
{ title: '车辆轨迹', render: 'transportInfo', className: 'text-center', width: '250px' },
{ title: '司机轨迹', render: 'payeeName', className: 'text-center', width: '150px' },
{ title: '上传次数', render: 'transportInfo', className: 'text-center', width: '150px' },
{ title: '上传时间', render: 'transportInfo', className: 'text-center', width: '180px' },
];
}
/**
*撤销
* @param record 记录实例
*/
recall() {
if (this.selectedRows.length === 0) {
this.openWainingModal('请选择需要撤回的数据');
return;
}
this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
if (res) {
this.search();
}
})
}
selectChange(item: any) {
this.selectedIndex = item?.representationsStatus || '';
setTimeout(() => {
this.st.load(1);
})
}
/**
* 查看当行数据
*/
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;
}
}
/**
*
* @param params 上传设置
*/
uploadSetting() {
const modalRef = this.modal.create({
nzTitle: '上传设置',
nzWidth: 600,
nzContent: DatatableReportingUploadSettingComponent,
nzComponentParams: {},
nzFooter: null
});
modalRef.afterClose.subscribe(res => {
})
}
/**
* 查看校验结果
*/
viewResult(item: any) {
const modalRef = this.modal.create({
nzTitle: '校验结果',
nzWidth: 1200,
nzContent: DatatableReportingVerifyResultComponent,
nzComponentParams: {
record: item
},
nzFooter: null
});
modalRef.afterClose.subscribe(res => {
})
}
/**
* 查看监管审核结果
*/
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,
})
}
}

50
src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html
View File

@ -29,46 +29,18 @@
[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]="false">
<ng-template st-row="orderSn" let-item let-index="index">
<a (click)="view(item)">{{item.billCode}}</a>
<ng-template st-row="orderStatus" let-item let-index="index">
<a (click)="viewAuditResult(item)" *ngIf="item?.billStatus === '2'">{{item?.billStatusLabel}}</a>
<span *ngIf="item?.billStatus !== '2'">{{item?.billStatusLabel}}</span>
</ng-template>
<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-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="loadingPlace" let-item let-index="index">
<div *ngFor="let address of item.loadingAddressArr">{{ address }} </div>
</ng-template>
<ng-template st-row="dischargePlace" let-item let-index="index">
<div *ngFor="let address of item.unloadingAddressArr">{{ address }}</div>
</ng-template>
<ng-template st-row="goodsInfoVOList" let-item>
<div *ngFor="let item of item.goodsInfoVOList">
<div>货物名称 : {{item.goodsName}}</div>
<div>重量/体积 : {{item.weight}}/{{item.volume}}</div>
<div>车型/车长 :{{item.carModelLabel}}/{{item.carLengthLabel}}</div>
</div>
</ng-template>
<ng-template st-row="driver" let-item>
<div> {{item.driverName}}</div>
<div>{{item.driverPhone}}</div>
<div>{{item.carNo}}</div>
</ng-template>
<ng-template st-row="payeeName" let-item>
<div>{{item.payeeName}}</div>
<div>{{item.payeePhone}}</div>
</ng-template>
<ng-template st-row="transportInfo" let-item>
<div>创建时间:{{item.createTime}}</div>
<div>装货时间:{{item.loadTime}}</div>
<div>卸货时间:{{item.unloadTime}}</div>
</ng-template>
<ng-template st-row="billComplianceVOS" let-item>
<div *ngFor="let item of item?.billComplianceVOS">{{item?.complianceName}}</div>
</ng-template>
<ng-template st-row="serviceType" let-item>
<div>{{item?.billTypeLabel}} （{{item?.serviceTypeLabel}}） </div>
<ng-template st-row="amount" let-item let-index="index">
<div class="text-right">{{item?.amount | currency :' '}}</div>
</ng-template>
</st>
</nz-card>
@ -79,7 +51,7 @@
<strong class="text-red">{{ selectedRows.length }}</strong> 条数据
</div>
<button nz-button nzType="primary" (click)="upload()">上传</button>
<button nz-button nzType="primary" (click)="recall({})">撤回</button>
<button nz-button nzType="primary" (click)="recall()">撤回</button>
<button nz-button nzType="primary" (click)="uploadSetting()">上传设置</button>
</div>
</ng-template>

5
src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.less Normal file
View File

@ -0,0 +1,5 @@
:host {
.text-black {
color: #000;
}
}

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

@ -1,15 +1,17 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { Router, ActivatedRoute } from '@angular/router';
import { ActivatedRoute, Router } from '@angular/router';
import { STColumn, STComponent, STData } from '@delon/abc/st';
import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
import { ModalHelper, _HttpClient } from '@delon/theme';
import { ShipperBaseService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
import { ReportingService } from '../../services/reporting.service';
import { DatatableReportingUploadSettingComponent } from '../upload-setting/upload-setting.component';
import { DatatableReportingVerifyResultComponent } from '../verify-result/verify-result.component';
@Component({
selector: 'app-datatable-order-reporting',
templateUrl: './order-reporting.component.html',
styleUrls: ['./order-reporting.component.less']
})
export class DatatableOrderReportingComponent implements OnInit {
_$expand = false;
@ -226,7 +228,7 @@ export class DatatableOrderReportingComponent implements OnInit {
],
ui: {
placeholder: '请选择',
widget: 'select',
visibleIf: {
_$expand: (value: boolean) => value,
},
@ -242,7 +244,7 @@ export class DatatableOrderReportingComponent implements OnInit {
],
ui: {
placeholder: '请选择',
widget: 'select',
visibleIf: {
_$expand: (value: boolean) => value,
},
@ -261,11 +263,11 @@ export class DatatableOrderReportingComponent implements OnInit {
*/
initST() {
this.columns = [
{ title: '', type: 'checkbox', className: 'text-center', width: '80px', },
{ title: '订单状态', index: 'name', className: 'text-center', width: '120px', },
{ title: '司机状态', index: 'name', className: 'text-center', width: '120px', },
{ title: '车辆状态', index: 'name', className: 'text-center', width: '120px', },
{ title: '本地校验', render: 'orderSn', className: 'text-center', width: '180px', },
{ title: '', type: 'checkbox', className: 'text-center', width: '60px', },
{ title: '订单状态', render: 'orderStatus', className: 'text-center', width: '120px', },
{ title: '司机状态', render: 'driverStatus', className: 'text-center', width: '120px', },
{ title: '车辆状态', render: 'carStatus', className: 'text-center', width: '120px', },
{ title: '本地校验', render: 'localValid', className: 'text-center', width: '120px', },
{
title: '订单号',
render: 'billComplianceVOS',
@ -278,71 +280,50 @@ export class DatatableOrderReportingComponent implements OnInit {
title: '网络货运人',
render: 'serviceType',
className: 'text-center',
width: '120px',
width: '180px',
},
{ title: '统一社会信用代码', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '300px' },
{ title: '业务类型', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '300px' },
{ title: '运单生成时间', render: 'goodsInfoVOList', className: 'text-center', width: '200px' },
{ title: '发货时间', render: 'driver', className: 'text-center', width: '150px' },
{ title: '收货时间', render: 'payeeName', className: 'text-center', width: '150px' },
{ title: '统一社会信用代码', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
{ title: '业务类型', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '120px' },
{ title: '运单生成时间', render: 'goodsInfoVOList', className: 'text-center', width: '180px' },
{ title: '发货时间', render: 'driver', className: 'text-center', width: '180px' },
{ title: '收货时间', render: 'payeeName', className: 'text-center', width: '180px' },
{ title: '托运人名称', render: 'transportInfo', className: 'text-center', width: '250px' },
{ title: '托运人统一社会信用代码', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '300px' },
{ title: '装货地址', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '300px' },
{ title: '运单生成时间', render: 'goodsInfoVOList', className: 'text-center', width: '200px' },
{ title: '托运人统一社会信用代码', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
{ title: '装货地址', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '200px' },
{ title: '收货方名称', render: 'driver', className: 'text-center', width: '150px' },
{ title: '收货地址', render: 'payeeName', className: 'text-center', width: '150px' },
{ title: '运费金额', render: 'transportInfo', className: 'text-center', width: '250px' },
{ title: '运费金额', render: 'amount', className: 'text-center', width: '250px' },
{ title: '车牌号', render: 'payeeName', className: 'text-center', width: '150px' },
{ title: '车牌颜色', render: 'transportInfo', className: 'text-center', width: '250px' },
{ title: '司机姓名', render: 'payeeName', className: 'text-center', width: '150px' },
{ title: '司机手机号码', render: 'transportInfo', className: 'text-center', width: '250px' },
{ title: '司机手机号码', render: 'transportInfo', className: 'text-center', width: '200px' },
{ title: '司机身份证号', render: 'payeeName', className: 'text-center', width: '150px' },
{ title: '货物信息', render: 'transportInfo', className: 'text-center', width: '250px' },
{ title: '货物信息', render: 'transportInfo', className: 'text-center', width: '180px' },
{ title: '实际承运人名称', render: 'payeeName', className: 'text-center', width: '150px' },
{ title: '实际承运人证件号码', render: 'transportInfo', className: 'text-center', width: '250px' },
{ title: '实际承运人证件号码', render: 'transportInfo', className: 'text-center', width: '200px' },
{ title: '实际承运人道路运输许可证号', render: 'payeeName', className: 'text-center', width: '150px' },
{ title: '车辆轨迹', render: 'transportInfo', className: 'text-center', width: '250px' },
{ title: '司机轨迹', render: 'payeeName', className: 'text-center', width: '150px' },
{ title: '上传次数', render: 'transportInfo', className: 'text-center', width: '250px' },
{ title: '上传时间', render: 'transportInfo', className: 'text-center', width: '250px' },
{
title: '操作',
width: '200px',
className: 'text-center',
buttons: [
// { text: '编辑', click: (_record: any) => this.appeal(_record) },
{
text: '申诉',
// click: (record) => this.appeal(record),
iif: (_record) => _record.representationsStatus === '1',
acl: { 'ability': ['RiskOrder-Appeal'] }
},
{
text: '撤销申诉',
pop: {
title: '是否确定立即撤销申诉？',
okType: 'danger',
},
click: (record) => this.recall(record),
iif: (_record) => _record.representationsStatus === '2',
acl: { 'ability': ['RiskOrder-CancleAppeal'] }
},
{ text: '详情', click: (_record: any) => this.view(_record), acl: { 'ability': ['RiskOrder-Detail'] } },
],
},
{ title: '上传次数', render: 'transportInfo', className: 'text-center', width: '150px' },
{ title: '上传时间', render: 'transportInfo', className: 'text-center', width: '180px' },
];
}
/**
* 删除单个实例
*撤销
* @param record 记录实例
*/
recall(record: STData) {
this.service.request(this.service.$api_recall_reporting, { id: record?.id }).subscribe((res: any) => {
recall() {
if (this.selectedRows.length === 0) {
this.openWainingModal('请选择需要撤回的数据');
return;
}
this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
if (res) {
this.search({ representationsStatus: '' });
this.search();
}
})
@ -390,7 +371,10 @@ export class DatatableOrderReportingComponent implements OnInit {
* 上传
*/
upload() {
if (this.selectedRows.length === 0) {
this.openWainingModal('请选择需要上传的数据');
return;
}
}
@ -399,10 +383,46 @@ export class DatatableOrderReportingComponent implements OnInit {
* @param params 上传设置
*/
uploadSetting() {
const modalRef = this.modal.create({
nzTitle: '上传设置',
nzWidth: 600,
nzContent: DatatableReportingUploadSettingComponent,
nzComponentParams: {},
nzFooter: null
});
modalRef.afterClose.subscribe(res => {
})
}
search(params = {}) {
/**
* 查看校验结果
*/
viewResult(item: any) {
const modalRef = this.modal.create({
nzTitle: '校验结果',
nzWidth: 1200,
nzContent: DatatableReportingVerifyResultComponent,
nzComponentParams: {
record: item
},
nzFooter: null
});
modalRef.afterClose.subscribe(res => {
})
}
/**
* 查看监管审核结果
*/
viewAuditResult(record: any) {
if (record?.billStatus !== '2') {
return;
}
this.openWainingModal('监管审核结果', record?.result)
}
search() {
this.st.load(1);
}
@ -413,4 +433,13 @@ export class DatatableOrderReportingComponent implements OnInit {
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/datatable/reporting/components/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>

24
src/app/routes/datatable/reporting/components/upload-setting/upload-setting.component.spec.ts Normal file
View File

@ -0,0 +1,24 @@
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { DatatableReportingUploadSettingComponent } from './upload-setting.component';
describe('DatatableReportingUploadSettingComponent', () => {
let component: DatatableReportingUploadSettingComponent;
let fixture: ComponentFixture<DatatableReportingUploadSettingComponent>;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [DatatableReportingUploadSettingComponent]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(DatatableReportingUploadSettingComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

109
src/app/routes/datatable/reporting/components/upload-setting/upload-setting.component.ts Normal file
View File

@ -0,0 +1,109 @@
import { Component, OnInit } from '@angular/core';
import { SFSchema, SFUISchema } from '@delon/form';
import { NzModalRef } from 'ng-zorro-antd/modal';
import { ReportingService } from '../../services/reporting.service';
@Component({
selector: 'app-datatable-upload-setting',
templateUrl: './upload-setting.component.html',
})
export class DatatableReportingUploadSettingComponent implements OnInit {
record: any = {};
i: any = {};
schema!: SFSchema;
ui!: SFUISchema;
constructor(
private modal: NzModalRef,
public service: ReportingService
) { }
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();
}
}

22
src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html Normal file
View File

@ -0,0 +1,22 @@
<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'}" [data]="service.$api_order_reporting_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: false}" [loading]="false">
<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>

24
src/app/routes/datatable/reporting/components/verify-result/verify-result.component.spec.ts Normal file
View File

@ -0,0 +1,24 @@
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { DatatableReportingVerifyResultComponent } from './verify-result.component';
describe('DatatableReportingVerifyResultComponent', () => {
let component: DatatableReportingVerifyResultComponent;
let fixture: ComponentFixture<DatatableReportingVerifyResultComponent>;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [DatatableReportingVerifyResultComponent]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(DatatableReportingVerifyResultComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

85
src/app/routes/datatable/reporting/components/verify-result/verify-result.component.ts Normal file
View File

@ -0,0 +1,85 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { Router } from '@angular/router';
import { STColumn, STComponent } from '@delon/abc/st';
import { SFSchema } from '@delon/form';
import { ModalHelper, _HttpClient } from '@delon/theme';
import { NzModalRef } from 'ng-zorro-antd/modal';
import { ReportingService } from '../../services/reporting.service';
@Component({
selector: 'app-datatable-verify-result',
templateUrl: './verify-result.component.html',
})
export class DatatableReportingVerifyResultComponent implements OnInit {
url = `/user`;
searchSchema: SFSchema = {
properties: {
no: {
type: 'string',
title: '编号'
}
}
};
@ViewChild('st') private readonly st!: STComponent;
columns: STColumn[] = [];
record: any = {}
tabs: any[] = [
{ name: '订单信息', value: '1' },
{ name: '司机信息', value: '2' },
{ name: '车辆信息', value: '3' },
];
get reqParams() {
return {};
}
constructor(public service: ReportingService, private modalRef: NzModalRef, public router: Router) {
}
ngOnInit(): void {
this.initST();
}
/**
* 初始化数据列表
*/
initST() {
this.columns = [
{ title: '序号', type: 'no', className: 'text-center', width: '60px', },
{ title: '监管平台字段', index: 'orderStatus', className: 'text-center', width: '120px', },
{ title: '系统字段', index: 'orderStatus', className: 'text-center', width: '100px', },
{ title: '归属模块', index: 'orderStatus', className: 'text-center', width: '120px', },
{ title: '是否必填', index: 'orderStatus', className: 'text-center', width: '100px', },
{ title: '上传值', index: 'orderStatus', className: 'text-center', width: '150px', },
{ title: '本地校验', index: 'orderStatus', className: 'text-center', width: '100px', },
{ title: '错误内容', index: 'orderStatus', className: 'text-center', width: '150px', },
]
}
add(): void {
// this.modal
// .createStatic(FormEditComponent, { i: { id: 0 } })
// .subscribe(() => this.st.reload());
}
selectTab(e: any) {
}
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();
}
}

4
src/app/routes/datatable/reporting/services/reporting.service.ts
View File

@ -6,9 +6,11 @@ import { BaseService } from '@shared';
})
export class ReportingService extends BaseService {
$api_order_reporting_page = ``; // 订单上报列表
$api_order_reporting_page = `/api/sdc/billOperate/listWholePage`; // 订单上报列表
$api_recall_reporting = ``; // 撤回
$api_async_export_order_reporting_list = ``; // 导出订单上报
$api_get_upload_setting = ``; // 修改上传设置
$api_upload_setting_save = ``; // 修改上传设置
constructor(public injector: Injector) {
super(injector);
}

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

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-06 20:20:26
* @LastEditors : Shiming
* @LastEditTime : 2022-03-29 11:09:00
* @LastEditTime : 2022-03-29 14:30:12
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -222,7 +222,7 @@
</ng-template>
</div>
</nz-card>
<nz-card>
<nz-card *ngIf="!route?.snapshot?.queryParams?.sts">
<nz-tabset >
<nz-tab nzTitle="风险异常检测">
<button nz-button nzType="primary"[disabled]="">申 诉</button>

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

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-06 20:20:26
* @LastEditors : Shiming
* @LastEditTime : 2022-03-23 14:44:43
* @LastEditTime : 2022-03-29 14:30:11
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -65,14 +65,17 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
mapList:any[] = []; //地图点位数据组
addressItems:any[] = []; //打点地址数据组
constructor(
private route: ActivatedRoute,
public route: ActivatedRoute,
private msgSrv: NzMessageService,
private service: OrderManagementService,
private router: Router,
private modal: NzModalService
) {}
) {
}
ngOnInit(): void {
console.log(this.route?.snapshot?.queryParams?.sts);
this.initData();
this.getTrajectory();
}

4
src/app/routes/order-management/components/complaint-detail/complaint-detail.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-04 17:29:18
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:18:54
* @LastEditTime : 2022-03-29 16:26:09
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\complaint-detail\\complaint-detail.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -21,7 +21,7 @@
<ng-template #cardTemplate>
<button nz-button nzType="primary" [nzLoading]="false" (click)="viewEvaluate()" *ngIf="complaint?.complaintStatus == 1" [disabled]="complaintStatus">处理</button>
</ng-template>
<h2>投诉单号：{{datailList?.id}}</h2>
<h2>投诉单号：{{datailList?.complaintCode}}</h2>
<sf #sf [compact]="true" [ui]="ui" [schema]="schema" [button]="'none'" *ngIf="schema" [formData]="datailList">
<ng-template sf-template="imgUrls" let-schema="schema" let-item let-ui="ui">
<app-imagelist [imgList]="datailList?.imgUrls"></app-imagelist>

6
src/app/routes/order-management/components/complaint/complaint.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming
* @LastEditTime : 2022-03-23 10:11:08
* @LastEditTime : 2022-03-29 16:13:40
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\complaint\\complaint.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -21,10 +21,10 @@
<nz-card>
<div nz-row nzGutter="12">
<!-- 查询字段大于3个时，根据展开状态调整布局 -->
<div nz-col [nzSpan]="18">
<div nz-col [nzSpan]="24">
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
</div>
<div nz-col [nzSpan]="6" >
<div nz-col [nzSpan]="24" style="display: flex; justify-content: flex-end;">
<button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="false"
(click)="st?.load(1)" acl [acl-ability]="['ORDER-COMPLAINT-search']">查询</button>
<button nz-button nzType="primary" acl [acl-ability]="['ORDER-COMPLAINT-export']"

14
src/app/routes/order-management/components/complaint/complaint.component.ts
View File

@ -106,18 +106,24 @@ export class OrderManagementComplaintComponent implements OnInit {
type: 'string',
ui: {
widget: 'dict-select',
params: { dictKey: 'complaint:cause' },
params: { dictKey: 'drvcomplaint:cause' },
containsAllLabel: true,
} as SFSelectWidgetSchema
},
complainantTime: {
type: 'string',
title: '投诉时间',
ui: { widget: 'sl-from-to', type: 'date', format: 'yyyy-MM-dd' } as SFDateWidgetSchema,
ui: {
widget: 'sl-from-to', type: 'date', format: 'yyyy-MM-dd' } as SFDateWidgetSchema,
},
},
};
this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
this.ui =
{
'*': { spanLabelFixed: 110, grid: { span: 8, gutter: 8 } },
};
}
/**
@ -145,7 +151,7 @@ export class OrderManagementComplaintComponent implements OnInit {
className: 'text-center',
},
{ title: '托运方', index: 'shipperAppUserName', width: '200px', className: 'text-center' },
{ title: '司机', index: 'driverIdLabel', width: '120px', className: 'text-center' },
{ title: '司机', index: 'driverName', width: '120px', className: 'text-center' },
{
title: '投诉原因',
className: 'text-center',

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

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming
* @LastEditTime : 2022-03-25 13:44:42
* @LastEditTime : 2022-03-29 14:28:39
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\compliance-audit\\compliance-audit.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -88,7 +88,7 @@
</ng-template>
<ng-template st-row="billCode" let-item let-index="index">
<a *ngIf="item.billType == '1'" [routerLink]="'/order-management/vehicle/vehicle-detail/' + item.id">{{ item.billCode }}</a>
<a *ngIf="item.billType == '2'" [routerLink]="'/order-management/bulk/bulk-detail/' + item.id">{{ item.billCode }}</a>
<a *ngIf="item.billType == '2'" [routerLink]="'/order-management/bulk/bulk-detail/' + item.id" [queryParams]="{ sts :1}">{{ item.billCode }}</a>
<a *ngIf="item.billType == '3'" [routerLink]="'/order-management/vehicle/vehicle-detail/' + item.id">{{ item.billCode }}</a>
<div>
<span>{{ item?.billStatusLabel }}</span>

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

@ -25,6 +25,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
changeId: any; // 主页面查看运费变更记录id - 用于运费变更记录
changeViewId: any; // 查看运费变更记录id - 用于查看
auditId: any;
auditIdR: any;
auditMany = false;
isVisibleView = false;
isVisibleEvaluate = false;
@ -142,7 +143,6 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
type: 'string',
title: '订单号',
ui: {
placeholder: '最多100个单号，空号隔开'
}
},
resourceCode: {
@ -629,7 +629,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
idList.push(item.id);
});
} else {
idList.push(this.sfView.value.billCode)
idList.push(this?.auditIdR)
}
const parms = {
ids: idList,
@ -681,7 +681,8 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
audit(item?: any) {
if (item) {
this.isVisibleRE = true;
this.auditId = item.id;
this.auditId = item.billCode;
this.auditIdR = item.id;
this.initSTAudit(1);
} else {
if (this.selectedRows.length <= 0) {

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

@ -146,14 +146,14 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
type: 'string',
title: '订单号',
ui: {
placeholder: '最多100个单号，空号隔开'
placeholder: '请输入'
}
},
wayBillCode: {
type: 'string',
title: '运单号',
ui: {
placeholder: '最多100个运单，空号隔开'
placeholder: '请输入'
}
},
resourceCode: {

25
src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html
View File

@ -229,7 +229,30 @@
</ng-template>
</div>
</nz-card>
<nz-card *ngIf="!route?.snapshot?.queryParams?.sts">
<nz-tabset >
<nz-tab nzTitle="风险异常检测">
<button nz-button nzType="primary"[disabled]="">申 诉</button>
<div>
您的订单可能存在交易风险，请及时提交申诉材料，提交成功后，平台将及时完成审核并通知您!
</div>
<div>如果您的运单没有问题，可以提出申诉，并提供相关资料，我们将24小时内审核反馈</div>
<ul *ngFor="let item of abnormalList">
<li>系统识别:{{item?.complianceTypeName}}</li>
<li>{{item?.determineDetails}}，您可在企业端提交申诉材料或联系客服。</li>
<li>2021-11-07 03:20:15</li>
</ul>
</nz-tab>
<nz-tab nzTitle="异常预警">
<st #st [data]="addressItems" [columns]="logColumns2" [ps]="0" [page]="{ show: false, showSize: false }">
</st>
</nz-tab>
<nz-tab nzTitle="操作日志">
<st #st [data]="addressItems" [columns]="logColumns2" [ps]="0" [page]="{ show: false, showSize: false }">
</st>
</nz-tab>
</nz-tabset>
</nz-card>
<nz-modal [(nzVisible)]="isVisible" nzWidth="1000px" [nzFooter]="nzModalFooter" [nzTitle]="modalTitle" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel()">
<ng-container *nzModalContent>
<div *ngIf="!modalcontent">暂无附件信息</div>

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

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-28 14:42:03
* @LastEditors : Shiming
* @LastEditTime : 2022-03-23 14:45:58
* @LastEditTime : 2022-03-29 16:08:56
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -29,6 +29,7 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
mapList: any[] = []; //地图点位数据组
pois: any[] = [];
addressItems: any[] = []; //打点地址数据组
abnormalList: any[] = [];
i: any = {
unLoadingPlaceList: [],
billExpenseDetails: [],
@ -66,7 +67,7 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
}
];
constructor(
private route: ActivatedRoute,
public route: ActivatedRoute,
private msgSrv: NzMessageService,
private service: OrderManagementService,
private router: Router,
@ -102,6 +103,19 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
this.i.scheduleVOList = this.i?.scheduleVOList?.filter((data: any) => data.displayStatus !== 'HIDE');
}
});
this.service.request(this.service.$api_listBillComplianceAbnormalByBillId, { id: this.id }).subscribe(res => {
if (res) {
console.log('风险详情')
console.log(res)
this.abnormalList = res
}
});
this.service.request(this.service.$api_getAbnormalWarningByBillId, { id: this.id }).subscribe(res => {
if (res) {
console.log('异常预警')
console.log(res)
}
});
}
// 取消订单
cancellation() {

6
src/app/routes/partner/partner-list/components/index/partner-list.component.ts
View File

@ -71,6 +71,9 @@ export class PartnerListComponent {
nzComponentParams: { info: { ...item, enterpriseName: item.enterpriseName || item.contactName }, sourcePage: '合伙人审核列表' },
nzFooter: null
});
modal.afterClose.subscribe(res => {
modal.destroy();
});
}
editTemplateAction(item: any) {
@ -102,6 +105,7 @@ export class PartnerListComponent {
.subscribe(res => {
if (res) {
this.service.msgSrv.success('修改成功');
this.st.load(1);
this.nzModalService.closeAll();
}
});
@ -161,6 +165,7 @@ export class PartnerListComponent {
if (res) {
this.service.msgSrv.success('修改成功');
this.nzModalService.closeAll();
this.st.load(1);
}
});
}
@ -185,6 +190,7 @@ export class PartnerListComponent {
} else {
this.service.msgSrv.warning('发起失败');
}
this.st.load(1);
});
}
});

1
src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts
View File

@ -112,6 +112,7 @@ export class PartnerAuditModalComponent implements OnInit {
};
this.service
.request(this.service.$api_audit_partner, {
...params,
auditStatusEnum: params.auditStatusEnum,
id: params.id,
approvalOpinion: params.approvalOpinion,

8
src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html
View File

@ -16,8 +16,8 @@
<p style="margin-bottom: 0">{{ detailData?.enterpriseName }}</p>
</div>
<div nz-col [nzLg]="12" [nzSm]="24" [nzXs]="24">
<nz-badge nzStatus="success" nzText="正常" *ngIf="detailData?.stateLocked === 0"> </nz-badge>
<nz-badge nzStatus="error" nzText="冻结" *ngIf="detailData?.stateLocked === 1"></nz-badge>
<nz-badge nzStatus="success" nzText="正常" *ngIf="detailData?.lockedStatus === 0"> </nz-badge>
<nz-badge nzStatus="error" nzText="冻结" *ngIf="detailData?.lockedStatus === 1"></nz-badge>
</div>
</div>
<div nz-row>
@ -46,12 +46,12 @@
</ng-container>
<ng-container *ngIf="detailData?.approvalStatus != 10">
<button [disabled]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="enable"
(nzOnConfirm)="freezeOrResume(0)" nzPopconfirmPlacement="bottomRight" *ngIf="detailData?.stateLocked"
(nzOnConfirm)="freezeOrResume(0)" nzPopconfirmPlacement="bottomRight" *ngIf="detailData?.lockedStatus"
acl [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-lock']">
启用
</button>
<button [disabled]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="frozen"
(nzOnConfirm)="freezeOrResume(1)" nzPopconfirmPlacement="bottomRight" *ngIf="!detailData?.stateLocked"
(nzOnConfirm)="freezeOrResume(1)" nzPopconfirmPlacement="bottomRight" *ngIf="!detailData?.lockedStatus"
acl [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-lock']">
冻结
</button>

6
src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts
View File

@ -117,8 +117,10 @@ export class PartnerDetailComponent implements OnInit, OnDestroy {
freezeOrResume(type: number) {
this.service.http
.post(this.service.$api_lock_freight, {
id: this.route.snapshot.params.id,
statedLocked: !!type
appUserId: [this.detailData.appUserId],
freezeOrResume: !!type,
pageName: '合伙人详情',
telephone: this.detailData.adminUserInfo.mobile
})
.subscribe(res => {
if (res.data === true) {

8
src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.html
View File

@ -16,8 +16,8 @@
<p style="margin-bottom: 0">{{ detailData?.adminUserInfo?.name }}</p>
</div>
<div nz-col [nzLg]="12" [nzSm]="24" [nzXs]="24">
<nz-badge nzStatus="success" nzText="正常" *ngIf="detailData?.stateLocked === 0"> </nz-badge>
<nz-badge nzStatus="error" nzText="冻结" *ngIf="detailData?.stateLocked === 1"></nz-badge>
<nz-badge nzStatus="success" nzText="正常" *ngIf="detailData?.lockedStatus === 0"> </nz-badge>
<nz-badge nzStatus="error" nzText="冻结" *ngIf="detailData?.lockedStatus === 1"></nz-badge>
</div>
</div>
<div nz-row>
@ -46,12 +46,12 @@
</ng-container>
<ng-container *ngIf="detailData?.approvalStatus != 10">
<button [disabled]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="enable"
(nzOnConfirm)="freezeOrResume(0)" nzPopconfirmPlacement="bottomRight" *ngIf="detailData?.stateLocked"
(nzOnConfirm)="freezeOrResume(0)" nzPopconfirmPlacement="bottomRight" *ngIf="detailData?.lockedStatus"
acl [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-lock']">
启用
</button>
<button [disabled]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="frozen"
(nzOnConfirm)="freezeOrResume(1)" nzPopconfirmPlacement="bottomRight" *ngIf="!detailData?.stateLocked"
(nzOnConfirm)="freezeOrResume(1)" nzPopconfirmPlacement="bottomRight" *ngIf="!detailData?.lockedStatus"
acl [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-lock']">
冻结
</button>

6
src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts
View File

@ -92,8 +92,10 @@ export class PersonalPartnerDetailComponent implements OnInit {
freezeOrResume(type: number) {
this.service.http
.post(this.service.$api_lock_freight, {
id: this.route.snapshot.params.id,
statedLocked: !!type
appUserId: [this.detailData.appUserId],
freezeOrResume: !!type,
pageName: '合伙人详情',
telephone: this.detailData.adminUserInfo.mobile
})
.subscribe(res => {
if (res.data === true) {

2
src/app/routes/partner/partner-list/services/partner-list.service.ts
View File

@ -38,7 +38,7 @@ export class PartnerListService extends ShipperBaseService {
// 渠道销售修改详情
$api_get_partner_change_list = '/api/mdc/partnerChannelRelLog/partnerChannelUpdateDetaiList';
// 冻结/启用企业业
$api_lock_freight = '/api/mdc/cuc/enterpriseInfo/operate/lock';
$api_lock_freight = '/api/mdc/cuc/userApp/freezeOrResume';
// 根据地区code查询列表
$api_get_region_by_code = '/api/mdc/pbc/region/getRegionByCode';

2
src/app/shared/services/business/shipper-base.service.ts
View File

@ -297,7 +297,7 @@ export class ShipperBaseService extends BaseService {
map(res => {
if (res) {
return res.map((m: any) => {
return { label: `${m.employeeVO?.empName}/${m.employeeVO?.mobile}`, value: m.userAppId };
return { label: `${m.employeeVO?.empName}/${m.employeeVO?.mobile}`, value: m.id };
});
} else {
return [];