Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop
This commit is contained in:
Taric Xin
@ -0,0 +1,46 @@
|
||||
<page-header-wrapper [title]="''" [logo]="logo">
|
||||
<ng-template #logo>
|
||||
<button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
|
||||
<i nz-icon nzType="left" nzTheme="outline"></i>
|
||||
</button>
|
||||
</ng-template>
|
||||
</page-header-wrapper>
|
||||
<nz-card nzTitle="运单信息">
|
||||
<sv-container labelWidth="150" col="2">
|
||||
<sv label="订单号">{{i?.billCode}}</sv>
|
||||
<sv label="申诉状态">{{i?.representationsStatus}}</sv>
|
||||
<sv label="承运司机">{{i?.driverName}} / {{i?.driverPhoneNumber}} / {{i?.carId}}</sv>
|
||||
<sv label="收款人"> {{i?.payeeName}} / {{i?.payeePhoneNumber}} </sv>
|
||||
<sv label="装货时间">{{i?.loadTime}}</sv>
|
||||
<sv label="卸货时间">{{i?.unloadTime}}</sv>
|
||||
<sv label="装货地">{{i?.loadingPlace}}</sv>
|
||||
<sv label="卸货地">{{i?.dischargePlace}}</sv>
|
||||
<sv label="异常原因" col="1">
|
||||
<div class="bg-grey-lighter p-sm">
|
||||
<div *ngFor="let item of abnormalReason">{{item}}</div>
|
||||
</div>
|
||||
</sv>
|
||||
</sv-container>
|
||||
</nz-card>
|
||||
<nz-card nzTitle="申诉信息" [nzExtra]="extraTemplate">
|
||||
<ng-template #extraTemplate>
|
||||
<button nzType="primary" (click)="edit(i)" nzGhost nz-button>编辑</button>
|
||||
</ng-template>
|
||||
<sf #sf [compact]="true" [ui]="ui" [schema]="schema" [button]="'none'" *ngIf="schema" [formData]="i">
|
||||
<ng-template sf-template="enterpriseQualificationCe" let-schema="schema" let-me let-ui="ui">
|
||||
<app-imagelist [imgList]="me.value"></app-imagelist>
|
||||
</ng-template>
|
||||
</sf>
|
||||
</nz-card>
|
||||
|
||||
<nz-card class="dealBox" nzTitle="申诉处理">
|
||||
<nz-timeline nzMode="left">
|
||||
<nz-timeline-item nzLabel="2015-09-01" nzColor="green">申诉成功</nz-timeline-item>
|
||||
<nz-timeline-item nzLabel="2015-09-01 09:12:11">重新提交申诉申请<div class="info">操作人员：张三</div>
|
||||
</nz-timeline-item>
|
||||
<nz-timeline-item nzLabel="2015-09-01 09:12:11">驳回<div class="info">操作人员：张三</div>
|
||||
</nz-timeline-item>
|
||||
<nz-timeline-item nzLabel="2015-09-01 09:12:11">提交申诉申请<div class="info">操作人员：张三</div>
|
||||
</nz-timeline-item>
|
||||
</nz-timeline>
|
||||
</nz-card>
|
||||
@ -0,0 +1,10 @@
|
||||
.info{
|
||||
color: #666;
|
||||
}
|
||||
:host{
|
||||
::ng-deep{
|
||||
.dealBox .ant-card-body{
|
||||
width: 500px;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,24 @@
|
||||
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
import { OrderManagementRiskDetailComponent } from './risk-detail.component';
|
||||
|
||||
describe('OrderManagementRiskDetailComponent', () => {
|
||||
let component: OrderManagementRiskDetailComponent;
|
||||
let fixture: ComponentFixture<OrderManagementRiskDetailComponent>;
|
||||
|
||||
beforeEach(waitForAsync(() => {
|
||||
TestBed.configureTestingModule({
|
||||
declarations: [ OrderManagementRiskDetailComponent ]
|
||||
})
|
||||
.compileComponents();
|
||||
}));
|
||||
|
||||
beforeEach(() => {
|
||||
fixture = TestBed.createComponent(OrderManagementRiskDetailComponent);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
||||
@ -0,0 +1,124 @@
|
||||
import { Component, OnInit, ViewChild } from '@angular/core';
|
||||
import { ActivatedRoute } from '@angular/router';
|
||||
import { SFComponent, SFSchema, SFSelectWidgetSchema, SFTextareaWidgetSchema, SFUISchema } from '@delon/form';
|
||||
import { _HttpClient } from '@delon/theme';
|
||||
import { NzModalService } from 'ng-zorro-antd/modal';
|
||||
import { SupplyManagementService } from '../../services/order-management.service';
|
||||
// import { RiskOrderService } from '../../services/risk-order.service';
|
||||
// import { CtcAppealComponent } from '../appeal/appeal.component';
|
||||
|
||||
@Component({
|
||||
selector: 'app-oder-management-component-risk-detail',
|
||||
templateUrl: './risk-detail.component.html',
|
||||
styleUrls: ['./risk-detail.component.less']
|
||||
})
|
||||
export class OrderManagementRiskDetailComponent implements OnInit {
|
||||
@ViewChild('sf', { static: false }) sf!: SFComponent;
|
||||
ui: SFUISchema = {};
|
||||
schema: SFSchema = {};
|
||||
abnormalReason = [
|
||||
'司机装货轨迹异常',
|
||||
'司机卸货轨迹异常',
|
||||
'车辆装货轨迹异常',
|
||||
'司机位置未移动，或运输途中未打开APP',
|
||||
'运单轨迹严重异常'
|
||||
]
|
||||
i: any;
|
||||
id: string = '';
|
||||
constructor(private modal: NzModalService, public service: SupplyManagementService, public ar: ActivatedRoute) {
|
||||
this.id = this.ar.snapshot.queryParams.id;
|
||||
}
|
||||
|
||||
ngOnInit(): void {
|
||||
this.initSF();
|
||||
if (this.id) this.getDetail(this.id);
|
||||
|
||||
}
|
||||
initSF() {
|
||||
this.schema = {
|
||||
properties: {
|
||||
enterpriseType: {
|
||||
title: '申诉原因',
|
||||
type: 'string',
|
||||
maxLength: 30,
|
||||
ui: {
|
||||
widget: 'text',
|
||||
change: (value, orgData) => console.log(value, orgData),
|
||||
} as SFSelectWidgetSchema,
|
||||
},
|
||||
enterpriseTyp: {
|
||||
title: '申诉描述',
|
||||
type: 'string',
|
||||
ui: {
|
||||
widget: 'textarea',
|
||||
placeholder: '请输入',
|
||||
autosize: {
|
||||
minRows: 4,
|
||||
maxRows: 4
|
||||
}
|
||||
},
|
||||
|
||||
readOnly: true
|
||||
|
||||
} as SFTextareaWidgetSchema,
|
||||
enterpriseQualificationCe: {
|
||||
type: 'string',
|
||||
title: '上传凭证',
|
||||
ui: {
|
||||
widget: 'custom'
|
||||
}
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
this.ui = {
|
||||
'*': {
|
||||
spanLabelFixed: 180,
|
||||
grid: { span: 18 },
|
||||
width: 600,
|
||||
},
|
||||
$title1: {
|
||||
spanLabelFixed: 0,
|
||||
},
|
||||
$title2: {
|
||||
spanLabelFixed: 0,
|
||||
},
|
||||
$title3: {
|
||||
spanLabelFixed: 0,
|
||||
},
|
||||
$unit: {
|
||||
spanLabelFixed: 20,
|
||||
grid: { span: 3 },
|
||||
},
|
||||
};
|
||||
}
|
||||
getDetail(id: string) {
|
||||
// this.service.request(this.service.$api_get_risk_order_detail, { id }).subscribe(res => {
|
||||
// if (res) {
|
||||
// this.i = res;
|
||||
// }
|
||||
// })
|
||||
}
|
||||
|
||||
edit(item: any): void {
|
||||
const modalRef = this.modal.create({
|
||||
nzTitle: '申诉',
|
||||
nzWidth: '40%',
|
||||
// nzContent: CtcAppealComponent,
|
||||
nzComponentParams: {
|
||||
i: item
|
||||
},
|
||||
nzFooter: null
|
||||
});
|
||||
modalRef.afterClose.subscribe(res => {
|
||||
if (res) {
|
||||
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
goBack() {
|
||||
window.history.go(-1)
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,7 +1,7 @@
|
||||
<!--
|
||||
* @Author: your name
|
||||
* @Date: 2021-12-03 11:10:14
|
||||
* @LastEditTime: 2021-12-07 14:42:43
|
||||
* @LastEditTime: 2021-12-16 10:36:33
|
||||
* @LastEditors: Please set LastEditors
|
||||
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
||||
* @FilePath: \tms-obc-web\src\app\routes\supply-management\components\vehicle\vehicle.component.html
|
||||
@ -43,34 +43,31 @@
|
||||
</nz-tab>
|
||||
</nz-tabset>
|
||||
<div style="margin-top: 15px;">
|
||||
<!-- [req]="{ method: 'GET', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
|
||||
<st
|
||||
#st
|
||||
[bordered]="true"
|
||||
[scroll]="{ x: '2000px' }"
|
||||
[data]="service.$api_get_listRiskPage"
|
||||
[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, 30, 50, 100, 200, 300, 500, 1000] }"
|
||||
[loadingDelay]="500" [loading]="service.http.loading" -->
|
||||
<st #st [scroll]="{ x: '1200px' }" [data]="service.$api_get_catalogue_member" [columns]="columns">
|
||||
<ng-template st-row="goodsId" let-item let-index="index">
|
||||
<a [routerLink]="'/order-management/vehicle-detail/'+item.id">{{item.no}}</a>
|
||||
[loadingDelay]="500"
|
||||
[loading]="service.http.loading"
|
||||
>
|
||||
<ng-template st-row="billCode" let-item let-index="index">
|
||||
<a [routerLink]="'/order-management/risk-detail/'+item.id">{{item?.billCode}}</a>
|
||||
</ng-template>
|
||||
<!-- <ng-template st-row="externalSn" let-item let-index="index">
|
||||
<span class="mr-xs">{{111111}}</span>
|
||||
<a (click)="editEnternalSn(item)">编辑</a>
|
||||
</ng-template> -->
|
||||
<ng-template st-row="enStatusStr27878" let-item let-index="index">
|
||||
<div class="mr-xs" nzPopoverTitle="Title" nz-popover [nzPopoverContent]="contentTemplate">{{item.no}}</div>
|
||||
</ng-template>
|
||||
<ng-template st-row="feiong" let-item let-index="index">
|
||||
<div style="color: aqua;" >
|
||||
{{item.no}}
|
||||
<ng-template st-row="billExpenseDetailVOList" let-item let-index="index">
|
||||
<div *ngFor="let i of item?.billExpenseDetailVOList">
|
||||
<p>{{i?.costName}}：¥{{i?.price}}</p>
|
||||
</div>
|
||||
</ng-template>
|
||||
<ng-template #contentTemplate>
|
||||
<div>
|
||||
<p>预付：¥200.00</p>
|
||||
<p>到付：¥200.00</p>
|
||||
<p>油卡：¥200.00</p>
|
||||
<p>回单付：¥200.00</p>
|
||||
<p>小计：¥200.00</p>
|
||||
<p>附加费：¥200.00</p>
|
||||
<ng-template st-row="goodsInfoVOList" let-item let-index="index">
|
||||
<div *ngFor="let i of item?.goodsInfoVOList">
|
||||
<p>货物名称：{{i?.goodsName}}</p>
|
||||
<p>重量/体积：{{i?.weight}}吨/{{i?.volume}}方</p>
|
||||
<p>车型/车长：{{i?.maxWeight}}/ {{i?.maxCube}}</p>
|
||||
</div>
|
||||
</ng-template>
|
||||
</st>
|
||||
|
||||
@ -2,11 +2,11 @@ import { Component, OnInit, ViewChild } from '@angular/core';
|
||||
import { STColumn, STComponent } from '@delon/abc/st';
|
||||
import { SFComponent, SFDateWidgetSchema, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
|
||||
import { ModalHelper, _HttpClient } from '@delon/theme';
|
||||
import { ShipperBaseService } from '@shared';
|
||||
import { NzModalService } from 'ng-zorro-antd/modal';
|
||||
import { map } from 'rxjs/operators';
|
||||
import { SupplyManagementService } from '../../services/order-management.service';
|
||||
|
||||
|
||||
@Component({
|
||||
selector: 'app-supply-management-risk',
|
||||
templateUrl: './risk.component.html',
|
||||
@ -65,7 +65,7 @@ export class OrderManagementRiskComponent implements OnInit {
|
||||
count: 0,
|
||||
},
|
||||
];
|
||||
constructor(public service: SupplyManagementService, private modal: NzModalService) { }
|
||||
constructor(public service: SupplyManagementService, public service2: ShipperBaseService, private modal: NzModalService) { }
|
||||
|
||||
/**
|
||||
* 查询参数
|
||||
@ -93,19 +93,19 @@ export class OrderManagementRiskComponent implements OnInit {
|
||||
this.schema = {
|
||||
properties: {
|
||||
_$expand: { type: 'boolean', ui: { hidden: true } },
|
||||
no: {
|
||||
billCode: {
|
||||
type: 'string',
|
||||
title: '运单号',
|
||||
title: '订单号',
|
||||
},
|
||||
no2: {
|
||||
resourceCode: {
|
||||
type: 'string',
|
||||
title: '货源编号'
|
||||
},
|
||||
no1: {
|
||||
externalResourceCode: {
|
||||
type: 'string',
|
||||
title: '外部订单号'
|
||||
},
|
||||
no3: {
|
||||
loadingPlace: {
|
||||
type: 'string',
|
||||
title: '装货地',
|
||||
ui: {
|
||||
@ -114,7 +114,7 @@ export class OrderManagementRiskComponent implements OnInit {
|
||||
},
|
||||
}
|
||||
},
|
||||
no4: {
|
||||
dischargePlace: {
|
||||
type: 'string',
|
||||
title: '卸货地',
|
||||
ui: {
|
||||
@ -123,7 +123,7 @@ export class OrderManagementRiskComponent implements OnInit {
|
||||
},
|
||||
}
|
||||
},
|
||||
no7: {
|
||||
driverName: {
|
||||
type: 'string',
|
||||
title: '承运司机',
|
||||
ui: {
|
||||
@ -150,23 +150,41 @@ export class OrderManagementRiskComponent implements OnInit {
|
||||
},
|
||||
}
|
||||
},
|
||||
sex: {
|
||||
freightType: {
|
||||
title: '运单类型',
|
||||
type: 'string',
|
||||
default: 0,
|
||||
enum: [
|
||||
{ label: '未知', value: 0 },
|
||||
{ label: '男', value: 1 },
|
||||
{ label: '女', value: 2 },
|
||||
{ label: '保密', value: 3 },
|
||||
],
|
||||
ui: {
|
||||
widget: 'select',
|
||||
widget: 'dict-select',
|
||||
params: { dictKey: 'BulkFreightUnitPriceType' },
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value,
|
||||
},
|
||||
} as SFSelectWidgetSchema,
|
||||
},
|
||||
shipperId: {
|
||||
title: '托运人',
|
||||
type: 'string',
|
||||
ui: {
|
||||
widget: 'dict-select',
|
||||
params: { dictKey: 'BulkFreightUnitPriceType' },
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value,
|
||||
},
|
||||
} as SFSelectWidgetSchema,
|
||||
},
|
||||
enterpriseInfoName: {
|
||||
type: 'string',
|
||||
title: '网络货运人',
|
||||
ui: {
|
||||
widget: 'select',
|
||||
placeholder: '请选择',
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value,
|
||||
},
|
||||
allowClear: true,
|
||||
asyncData: () => this.service2.getNetworkFreightForwarder(),
|
||||
},
|
||||
},
|
||||
createTime: {
|
||||
title: '创建时间',
|
||||
type: 'string',
|
||||
@ -194,61 +212,71 @@ export class OrderManagementRiskComponent implements OnInit {
|
||||
title: '申诉状态',
|
||||
width: '100px',
|
||||
className: 'text-center',
|
||||
render: 'goodsId'
|
||||
index: 'representationsStatusLabel'
|
||||
},
|
||||
{
|
||||
title: '运单号',
|
||||
title: '订单号',
|
||||
width: '100px',
|
||||
className: 'text-center',
|
||||
render: 'goodsId'
|
||||
render: 'billCode'
|
||||
},
|
||||
{
|
||||
title: '异常信息',
|
||||
width: '100px',
|
||||
className: 'text-center',
|
||||
index: 'abnormalCause',
|
||||
},
|
||||
{ title: '托运方', index: 'externalSn', width: '120px', className: 'text-center' },
|
||||
{ title: '无车承运人', index: 'linkUrl', width: '120px', className: 'text-center' },
|
||||
{ title: '托运人', index: 'shipperName', width: '120px', className: 'text-center' },
|
||||
{ title: '网络货运人', index: 'enterpriseInfoName', width: '120px', className: 'text-center' },
|
||||
{
|
||||
title: '运费明细',
|
||||
className: 'text-center',
|
||||
width: '120px',
|
||||
render: 'billExpenseDetailVOList',
|
||||
},
|
||||
{
|
||||
title: '运单类型',
|
||||
title: '服务类型',
|
||||
className: 'text-center',
|
||||
width: '120px',
|
||||
index: 'serviceType',
|
||||
}, {
|
||||
title: '装货地',
|
||||
className: 'text-center',
|
||||
width: '120px',
|
||||
width: '180px',
|
||||
index: 'loadingPlace',
|
||||
|
||||
},
|
||||
{
|
||||
title: '卸货地',
|
||||
className: 'text-center',
|
||||
width: '120px',
|
||||
width: '180px',
|
||||
index: 'dischargePlace',
|
||||
|
||||
},
|
||||
{
|
||||
title: '货物信息',
|
||||
className: 'text-center',
|
||||
width: '120px',
|
||||
width: '180px',
|
||||
render: 'goodsInfoVOList',
|
||||
|
||||
},
|
||||
{
|
||||
title: '承运司机',
|
||||
className: 'text-center',
|
||||
width: '120px',
|
||||
render: 'enStatusStr27878'
|
||||
render: 'driverName'
|
||||
},
|
||||
{
|
||||
title: '收款人',
|
||||
className: 'text-center',
|
||||
width: '120px',
|
||||
render: 'feiong'
|
||||
render: 'payeeName'
|
||||
},
|
||||
{
|
||||
title: '运输信息',
|
||||
className: 'text-center',
|
||||
width: '120px',
|
||||
render: 'timeer'
|
||||
},
|
||||
{
|
||||
title: '操作',
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/*
|
||||
* @Author: your name
|
||||
* @Date: 2021-12-03 15:31:52
|
||||
* @LastEditTime: 2021-12-07 14:47:51
|
||||
* @LastEditTime: 2021-12-16 10:22:08
|
||||
* @LastEditors: Please set LastEditors
|
||||
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
||||
* @FilePath: \tms-obc-web\src\app\routes\order-management\order-management-routing.module.ts
|
||||
@ -15,6 +15,7 @@ import { OrderManagementBulkComponent } from './components/bulk/bulk.component';
|
||||
import { OrderManagementCarManageComponent } from './components/car-manage/car-manage.component';
|
||||
import { OrderManagementComplaintComponent } from './components/complaint/complaint.component';
|
||||
import { OrderManagementDriverManageComponent } from './components/driver-manage/driver-manage.component';
|
||||
import { OrderManagementRiskDetailComponent } from './components/risk-detail/risk-detail.component';
|
||||
import { OrderManagementRiskComponent } from './components/risk/risk.component';
|
||||
import { OrderManagementVehicleDetailComponent } from './components/vehicle-detail/vehicle-detail.component';
|
||||
import { OrderManagementVehicleComponent } from './components/vehicle/vehicle.component';
|
||||
@ -29,6 +30,7 @@ const routes: Routes = [
|
||||
{ path: 'additionalc', component: OrderManagementAdditionalcComponent },
|
||||
{ path: 'additionalc-detail/:id', component: OrderManagementAdditionalcDetailComponent },
|
||||
{ path: 'risk', component: OrderManagementRiskComponent },
|
||||
{ path: 'risk-detail/:id', component: OrderManagementRiskDetailComponent },
|
||||
{ path: 'complaint', component: OrderManagementComplaintComponent },
|
||||
]
|
||||
@NgModule({
|
||||
|
||||
@ -15,6 +15,7 @@ import { OrderManagementBulkComponent } from './components/bulk/bulk.component';
|
||||
import { OrderManagementCarManageComponent } from './components/car-manage/car-manage.component';
|
||||
import { OrderManagementComplaintComponent } from './components/complaint/complaint.component';
|
||||
import { OrderManagementDriverManageComponent } from './components/driver-manage/driver-manage.component';
|
||||
import { OrderManagementRiskDetailComponent } from './components/risk-detail/risk-detail.component';
|
||||
import { OrderManagementRiskComponent } from './components/risk/risk.component';
|
||||
import { OrderManagementVehicleDetailComponent } from './components/vehicle-detail/vehicle-detail.component';
|
||||
|
||||
@ -48,6 +49,7 @@ const COMPONENTS: Type<void>[] = [
|
||||
VehicleConfirReceiptComponent,
|
||||
VehicleSureDepartComponent,
|
||||
VehicleSureArriveComponent,
|
||||
OrderManagementRiskDetailComponent
|
||||
];
|
||||
|
||||
@NgModule({
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/*
|
||||
* @Author: your name
|
||||
* @Date: 2021-12-03 15:31:52
|
||||
* @LastEditTime: 2021-12-14 20:10:24
|
||||
* @LastEditTime: 2021-12-16 09:41:13
|
||||
* @LastEditors: Please set LastEditors
|
||||
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
||||
* @FilePath: \tms-obc-web\src\app\routes\order-management\services\order-management.service.ts
|
||||
@ -21,6 +21,13 @@ export class SupplyManagementService extends BaseService {
|
||||
$api_del_driver = ``;
|
||||
// 获取货主企业列表
|
||||
public $api_getList = '/api/mdc/cuc/enterpriseInfo/cargoOwner/getList?_allow_anonymous=true';
|
||||
// 风险单：
|
||||
// 风险单列表查询
|
||||
$api_get_listRiskPage = `/api/sdc/billRiskOperate/listRiskPage`;
|
||||
// 风险单详情查询
|
||||
$api_get_getRiskDetail = `/api/sdc/billRiskOperate/getRiskDetail`;
|
||||
// 风险单列表查询
|
||||
$api_get_listRisk_audit = `/api/sdc/billRiskOperate/audit`;
|
||||
constructor(public injector: Injector) {
|
||||
super(injector)
|
||||
}
|
||||
|
||||
@ -161,7 +161,7 @@ export class VehicleComponentsAuditComponent implements OnInit {
|
||||
{
|
||||
text: '查看',
|
||||
click: (item) => {
|
||||
this.router.navigate(['./detail', item.tenantId], { relativeTo: this.ar });
|
||||
this.router.navigate(['./detail', item.id], { relativeTo: this.ar });
|
||||
// this.router.navigate(['./view', item.id], { relativeTo: this.ar, queryParams: { tenantId: item.tenantId } });
|
||||
},
|
||||
},
|
||||
@ -170,7 +170,7 @@ export class VehicleComponentsAuditComponent implements OnInit {
|
||||
];
|
||||
}
|
||||
daoyun(item: any) {
|
||||
this.router.navigate(['./view', item.tenantId], { relativeTo: this.ar });
|
||||
this.router.navigate(['./view', item.id], { relativeTo: this.ar });
|
||||
}
|
||||
expandToggle() {
|
||||
this._$expand = !this._$expand;
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
</ng-template>
|
||||
<ng-template #content>
|
||||
<sv-container col="3">
|
||||
<h2>车牌号：{{detailData?.carNo}}</h2>
|
||||
<sv-title style="font-weight: 700;">待审核
|
||||
<div style="float: right;">
|
||||
<ng-container *ngIf="!isEdit">
|
||||
@ -21,10 +22,10 @@
|
||||
</div>
|
||||
</sv-title>
|
||||
<sv label="申请时间">
|
||||
{{ detailData?.carNoColor }}
|
||||
{{ detailData?.approvalPassTime }}
|
||||
</sv>
|
||||
<sv label="录入人员">
|
||||
{{ detailData?.carNoColor }}
|
||||
{{ detailData?.saveUser }}
|
||||
</sv>
|
||||
</sv-container>
|
||||
</ng-template>
|
||||
@ -35,21 +36,35 @@
|
||||
<sv-container col="3">
|
||||
<sv-title style="font-weight: 700;">车辆基础信息
|
||||
</sv-title>
|
||||
<sv label="车牌号">
|
||||
<input nz-input type="text" [(ngModel)]="detailData.carNo" [readonly]="!isEdit" [nzBorderless]="!isEdit"
|
||||
[placeholder]="isEdit?'':'-'">
|
||||
</sv>
|
||||
<sv label="车牌颜色">
|
||||
<input nz-input type="text" [(ngModel)]="detailData.carNoColor" [readonly]="!isEdit" [nzBorderless]="!isEdit"
|
||||
[placeholder]="isEdit?'':'-'">
|
||||
<nz-select [(ngModel)]="detailData.carNoColor" [nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit"
|
||||
[nzShowArrow]="isEdit" [nzDisabled]="!isEdit">
|
||||
<nz-option
|
||||
*ngFor="let i of contenCarNoColor"
|
||||
[nzLabel]="i.label"
|
||||
[nzValue]="i.value"
|
||||
></nz-option>
|
||||
</nz-select>
|
||||
</sv>
|
||||
<sv label="车型">
|
||||
<input nz-input type="text" [(ngModel)]="detailData.carModel" [readonly]="!isEdit" [nzBorderless]="!isEdit"
|
||||
[placeholder]="isEdit?'':'-'">
|
||||
<nz-select [(ngModel)]="detailData.carModel" [nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit"
|
||||
[nzShowArrow]="isEdit" [nzDisabled]="!isEdit">
|
||||
<nz-option
|
||||
*ngFor="let i of contencarModel"
|
||||
[nzLabel]="i.label"
|
||||
[nzValue]="i.value"
|
||||
></nz-option>
|
||||
</nz-select>
|
||||
</sv>
|
||||
<sv label="车长">
|
||||
<input nz-input type="text" [(ngModel)]="detailData.carLength" [readonly]="!isEdit" [nzBorderless]="!isEdit"
|
||||
[placeholder]="isEdit?'':'-'">
|
||||
<nz-select [(ngModel)]="detailData.carLength" [nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit"
|
||||
[nzShowArrow]="isEdit" [nzDisabled]="!isEdit">
|
||||
<nz-option
|
||||
*ngFor="let i of contenCarLength"
|
||||
[nzLabel]="i.label"
|
||||
[nzValue]="i.value"
|
||||
></nz-option>
|
||||
</nz-select>
|
||||
</sv>
|
||||
<sv label="是否为挂车">
|
||||
<nz-select [(ngModel)]="detailData.isTrailer" [nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit"
|
||||
@ -58,11 +73,18 @@
|
||||
<nz-option [nzValue]="true" nzLabel="是"></nz-option>
|
||||
</nz-select>
|
||||
</sv>
|
||||
<sv label="是否挂靠">
|
||||
<nz-select [(ngModel)]="detailData.isSelf" [nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit"
|
||||
[nzShowArrow]="isEdit" [nzDisabled]="!isEdit">
|
||||
<nz-option [nzValue]="false" nzLabel="否"></nz-option>
|
||||
<nz-option [nzValue]="true" nzLabel="是"></nz-option>
|
||||
</nz-select>
|
||||
</sv>
|
||||
</sv-container>
|
||||
<sv-container col="1" class="mt-md">
|
||||
<sv label="车头照">
|
||||
<ng-container
|
||||
*ngTemplateOutlet="uploadTemplate;context:{image:detailData?.carFrontPhotoWatermark,key:'carFrontPhotoWatermark'}">
|
||||
*ngTemplateOutlet="uploadTemplate;context:{image:detailData?.carFrontPhoto,key:'carFrontPhoto'}">
|
||||
</ng-container>
|
||||
</sv>
|
||||
</sv-container>
|
||||
@ -74,37 +96,45 @@
|
||||
<input nz-input type="text" [(ngModel)]="detailData.archivesNo" [readonly]="!isEdit" [nzBorderless]="!isEdit"
|
||||
[placeholder]="isEdit?'':'-'">
|
||||
</sv>
|
||||
<sv label="准驾车型">
|
||||
<input nz-input type="text" [(ngModel)]="detailData.carModel" [readonly]="!isEdit" [nzBorderless]="!isEdit"
|
||||
[placeholder]="isEdit?'':'-'">
|
||||
</sv>
|
||||
<sv label="行驶证注册日期">
|
||||
<!-- <input nz-input type="text" [(ngModel)]="detailData.driverLicenseRegisterTime" [readonly]="!isEdit" [nzBorderless]="!isEdit"
|
||||
[placeholder]="isEdit?'':'-'"> -->
|
||||
<nz-date-picker [(ngModel)]="detailData.driverLicenseRegisterTime" [nzDisabled]="!isEdit"
|
||||
[nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''"></nz-date-picker>
|
||||
</sv>
|
||||
<sv label="行驶证到期日" col="3">
|
||||
</sv-container>
|
||||
|
||||
<sv-container col="2">
|
||||
<sv label="行驶证到期日">
|
||||
<!-- <input nz-input type="text" [(ngModel)]="detailData.driverLicenseEndTime" [readonly]="!isEdit" [nzBorderless]="!isEdit"
|
||||
[placeholder]="isEdit?'':'-'"> -->
|
||||
<nz-date-picker [(ngModel)]="detailData.driverLicenseEndTime" [nzDisabled]="!isEdit"
|
||||
[nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''"></nz-date-picker>
|
||||
</sv>
|
||||
<sv label="行驶证签发机关" col="2">
|
||||
<input nz-input type="text" [(ngModel)]="detailData.driverLicenseSigningOrg" [readonly]="!isEdit"
|
||||
[nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
|
||||
<sv label="行驶证签发机关">
|
||||
<input nz-input type="text" [(ngModel)]="detailData.driverLicenseSigningOrg" [readonly]="!isEdit" [nzBorderless]="!isEdit"
|
||||
[placeholder]="isEdit?'':'-'">
|
||||
</sv>
|
||||
</sv-container>
|
||||
|
||||
<sv-container col="3">
|
||||
<sv label="行驶证发证日期">
|
||||
<!-- <input nz-input type="text" [(ngModel)]="detailData.driverLicenseGetTime" [readonly]="!isEdit" [nzBorderless]="!isEdit"
|
||||
[placeholder]="isEdit?'':'-'"> -->
|
||||
<nz-date-picker [(ngModel)]="detailData.driverLicenseGetTime" [nzDisabled]="!isEdit"
|
||||
[nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''"></nz-date-picker>
|
||||
</sv>
|
||||
<sv label="车辆识别代码">
|
||||
<input nz-input type="text" [(ngModel)]="detailData.carDistinguishCode" [readonly]="!isEdit"
|
||||
[nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
|
||||
<input nz-input type="text" [(ngModel)]="detailData.carDistinguishCode" [readonly]="!isEdit" [nzBorderless]="!isEdit"
|
||||
[placeholder]="isEdit?'':'-'">
|
||||
</sv>
|
||||
<sv label="使用性质">
|
||||
<nz-select [(ngModel)]="detailData.useNature" [nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit"
|
||||
[nzShowArrow]="isEdit" [nzDisabled]="!isEdit">
|
||||
<nz-option [nzValue]="1" nzLabel="营运"></nz-option>
|
||||
<nz-option [nzValue]="0" nzLabel="非营运"></nz-option>
|
||||
</nz-select>
|
||||
<input nz-input type="text" [(ngModel)]="detailData.useNature" [readonly]="!isEdit" [nzBorderless]="!isEdit"
|
||||
[placeholder]="isEdit?'':'-'">
|
||||
</sv>
|
||||
</sv-container>
|
||||
|
||||
<sv-container col="3">
|
||||
<sv label="载重（吨）">
|
||||
<input nz-input type="text" [(ngModel)]="detailData.carLoad" [readonly]="!isEdit" [nzBorderless]="!isEdit"
|
||||
[placeholder]="isEdit?'':'-'">
|
||||
@ -117,15 +147,13 @@
|
||||
<input nz-input type="text" [(ngModel)]="detailData.carOwner" [readonly]="!isEdit" [nzBorderless]="!isEdit"
|
||||
[placeholder]="isEdit?'':'-'">
|
||||
</sv>
|
||||
<sv label="行驶证照片" col="1">
|
||||
<div class="d-flex">
|
||||
</sv-container>
|
||||
<sv-container col="1">
|
||||
<sv label="行驶证照片">
|
||||
<!-- <app-imagelist [imgList]="[detailData?.certificatePhotoFront,detailData?.certificatePhotoBack,detailData?.certificatePhotoFrontWatermark,detailData?.certificatePhotoBackWatermark]"></app-imagelist> -->
|
||||
<ng-container
|
||||
*ngTemplateOutlet="uploadTemplate;context:{image:detailData?.certificatePhotoFront,key:'certificatePhotoFront'}">
|
||||
</ng-container>
|
||||
<ng-container
|
||||
*ngTemplateOutlet="uploadTemplate;context:{image:detailData?.certificatePhotoFrontWatermark,key:'certificatePhotoFrontWatermark'}">
|
||||
</ng-container>
|
||||
</div>
|
||||
</sv>
|
||||
</sv-container>
|
||||
<nz-divider></nz-divider>
|
||||
@ -136,18 +164,23 @@
|
||||
[placeholder]="isEdit?'':'-'">
|
||||
</sv>
|
||||
<sv label="经营许可证号">
|
||||
<input nz-input type="text" [(ngModel)]="detailData.roadTransportLicenceNo" [readonly]="!isEdit"
|
||||
[nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
|
||||
<input nz-input type="text" [(ngModel)]="detailData.roadTransportLicenceNo" [readonly]="!isEdit" [nzBorderless]="!isEdit"
|
||||
[placeholder]="isEdit?'':'-'">
|
||||
</sv>
|
||||
<sv label="发证日期">
|
||||
<!-- <input nz-input type="text" [(ngModel)]="detailData.roadTransportStartTime" [readonly]="!isEdit" [nzBorderless]="!isEdit"
|
||||
[placeholder]="isEdit?'':'-'"> -->
|
||||
<nz-date-picker [(ngModel)]="detailData.roadTransportStartTime" [nzDisabled]="!isEdit"
|
||||
[nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''"></nz-date-picker>
|
||||
</sv>
|
||||
<sv label="有效期至">
|
||||
<!-- <input nz-input type="text" [(ngModel)]="detailData.roadTransportEndTime" [readonly]="!isEdit" [nzBorderless]="!isEdit"
|
||||
[placeholder]="isEdit?'':'-'"> -->
|
||||
<nz-date-picker [(ngModel)]="detailData.roadTransportEndTime" [nzDisabled]="!isEdit"
|
||||
[nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''"></nz-date-picker>
|
||||
</sv>
|
||||
<sv label="道路运输证照片">
|
||||
<!-- <app-imagelist [imgList]="[detailData?.roadTransportPhoto,detailData?.roadTransportPhotoWatermark ]"></app-imagelist> -->
|
||||
<ng-container
|
||||
*ngTemplateOutlet="uploadTemplate;context:{image:detailData?.roadTransportPhoto,key:'roadTransportPhoto'}">
|
||||
</ng-container>
|
||||
@ -158,7 +191,8 @@
|
||||
<sv-title style="font-weight: 700;">认证司机</sv-title>
|
||||
</sv-container>
|
||||
<st #st [bordered]="true" [columns]="columns" [data]="service.$api_get_queryDriverByCarId"
|
||||
[req]="{ method: 'POST', allInBody: true }" [res]="{ reName: { list: 'data', total: 'data' } }"
|
||||
[req]="{ method: 'POST', allInBody: true, params: reqParams }"
|
||||
[res]="{ reName: { list: 'data', total: 'data' } }"
|
||||
[ngStyle]="{ margin: '1rem 0' }" multiSort size="small" [page]="{ show: false }">
|
||||
<ng-template st-row="isSelf" let-item let-index="index">
|
||||
<div nz-tooltip [nzTooltipTitle]="item.enterpriseName">
|
||||
|
||||
@ -106,3 +106,9 @@
|
||||
letter-spacing: 0.7px;
|
||||
}
|
||||
}
|
||||
input {
|
||||
width: 200px;
|
||||
}
|
||||
.sv__container {
|
||||
padding-top: 10px;
|
||||
}
|
||||
@ -11,6 +11,7 @@ import { ImageViewComponent } from 'src/app/shared/components/imagelist';
|
||||
import { VehicleService } from '../../../services/vehicle.service';
|
||||
// import { VehicleComponentsListEditComponent } from '../edit/edit.component';
|
||||
// import { VehicleImgViewComponent } from '../img-view/img-view.component';
|
||||
import { EADateUtil } from '@shared';
|
||||
|
||||
@Component({
|
||||
selector: 'app-Vehicle-components-Audit-detail',
|
||||
@ -22,17 +23,18 @@ export class VehicleComponentsAuditDetailComponent implements OnInit {
|
||||
@ViewChild('redectModal', { static: false }) redectModal!: any;
|
||||
columns!: STColumn[];
|
||||
detailData: any = this.initData();
|
||||
tempalateData = { ...this.detailData };
|
||||
|
||||
tempalateData :any;
|
||||
contenCarNoColor: any;
|
||||
contencarModel: any;
|
||||
contenCarLength: any;
|
||||
isEdit = false;
|
||||
|
||||
approvalOpinion = '';
|
||||
|
||||
uploadURl = apiConf.waterFileUpload;
|
||||
disabledUpload = false;
|
||||
constructor(public service: VehicleService, private route: ActivatedRoute, private nzModalService: NzModalService) {}
|
||||
|
||||
ngOnInit() {
|
||||
this.getSelectList();
|
||||
this.getDetailList();
|
||||
this.initST();
|
||||
}
|
||||
@ -67,9 +69,9 @@ export class VehicleComponentsAuditDetailComponent implements OnInit {
|
||||
const params = {
|
||||
id: this.route.snapshot?.params?.id
|
||||
};
|
||||
this.service.request(`${this.service.$api_get_operate_get}`, params).subscribe(res => {
|
||||
console.log(res);
|
||||
// this.detailData = res;
|
||||
this.service.request(`${this.service.$api_get_operate_getaudit}`, params).subscribe(res => {
|
||||
this.detailData = res;
|
||||
this.tempalateData = res;
|
||||
});
|
||||
}
|
||||
|
||||
@ -116,6 +118,15 @@ export class VehicleComponentsAuditDetailComponent implements OnInit {
|
||||
|
||||
save() {
|
||||
this.isEdit = false;
|
||||
this.detailData.driverLicenseRegisterTime = EADateUtil.yearToDate(this.detailData?.driverLicenseRegisterTime)
|
||||
|
||||
this.detailData.driverLicenseEndTime = EADateUtil.yearToDate(this.detailData?.driverLicenseEndTime)
|
||||
|
||||
this.detailData.driverLicenseGetTime = EADateUtil.yearToDate(this.detailData?.driverLicenseGetTime)
|
||||
|
||||
this.detailData.roadTransportStartTime = EADateUtil.yearToDate(this.detailData?.roadTransportStartTime)
|
||||
|
||||
this.detailData.roadTransportEndTime = EADateUtil.yearToDate(this.detailData?.roadTransportEndTime)
|
||||
}
|
||||
|
||||
ratify() {
|
||||
@ -132,7 +143,12 @@ export class VehicleComponentsAuditDetailComponent implements OnInit {
|
||||
goBack() {
|
||||
window.history.go(-1);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询参数
|
||||
*/
|
||||
get reqParams() {
|
||||
return { id: this.route.snapshot?.params?.id };
|
||||
}
|
||||
showImg(url: any) {
|
||||
const params = {
|
||||
imgList: [url],
|
||||
@ -187,4 +203,26 @@ export class VehicleComponentsAuditDetailComponent implements OnInit {
|
||||
carFrontPhotoWatermark: ''
|
||||
};
|
||||
}
|
||||
// 获取录单员
|
||||
getSelectList() {
|
||||
this.Serveice("CarColor")
|
||||
this.Serveice("CarModel")
|
||||
this.Serveice("CarLength")
|
||||
}
|
||||
Serveice(param :any) {
|
||||
let value: any;
|
||||
this.service.request(`${this.service.$api_get_getDictValue}`,
|
||||
{
|
||||
dictKey: param
|
||||
}).subscribe((res) => {
|
||||
if(param === 'CarColor') {
|
||||
this.contenCarNoColor = res;
|
||||
} else if(param === 'CarModel') {
|
||||
this.contencarModel = res;
|
||||
} else if(param === 'CarLength') {
|
||||
this.contenCarLength = res;
|
||||
}
|
||||
})
|
||||
return value;
|
||||
}
|
||||
}
|
||||
|
||||
@ -95,18 +95,6 @@
|
||||
<input nz-input type="text" [(ngModel)]="detailData.archivesNo" [readonly]="!isEdit" [nzBorderless]="!isEdit"
|
||||
[placeholder]="isEdit?'':'-'">
|
||||
</sv>
|
||||
<sv label="准驾车型">
|
||||
<!-- <input nz-input type="text" [(ngModel)]="detailData.carModel" [readonly]="!isEdit" [nzBorderless]="!isEdit"
|
||||
[placeholder]="isEdit?'':'-'"> -->
|
||||
<nz-select [(ngModel)]="detailData.carModel" [nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit"
|
||||
[nzShowArrow]="isEdit" [nzDisabled]="!isEdit">
|
||||
<nz-option
|
||||
*ngFor="let i of contencarModel"
|
||||
[nzLabel]="i.label"
|
||||
[nzValue]="i.value"
|
||||
></nz-option>
|
||||
</nz-select>
|
||||
</sv>
|
||||
<sv label="行驶证注册日期">
|
||||
<!-- <input nz-input type="text" [(ngModel)]="detailData.driverLicenseRegisterTime" [readonly]="!isEdit" [nzBorderless]="!isEdit"
|
||||
[placeholder]="isEdit?'':'-'"> -->
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/*
|
||||
* @Author: your name
|
||||
* @Date: 2021-11-29 15:22:34
|
||||
* @LastEditTime: 2021-12-15 20:26:59
|
||||
* @LastEditTime: 2021-12-16 10:45:08
|
||||
* @LastEditors: Please set LastEditors
|
||||
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
||||
* @FilePath: \tms-obc-web\src\app\routes\usercenter\services\usercenter.service.ts
|
||||
@ -19,10 +19,14 @@ export class VehicleService extends BaseService {
|
||||
// 查询车辆认证表
|
||||
$api_get_operate_list = `/api/mdc/cuc/carLicense/operate/list/page`;
|
||||
// 查询用户车辆认证表（审核列表）
|
||||
$api_get_userCarLicense_list = `/api/mdc/cuc/userCarLicense/operate/list/page`;
|
||||
$api_get_userCarLicense_list = `/api/mdc/cuc/carLicenseAudit/operate/list/page`;
|
||||
// 获取车辆认证表
|
||||
$api_get_operate_get = `/api/mdc/cuc/carLicense/operate/get`;
|
||||
// 获取车辆认证表(审核列表）
|
||||
$api_get_operate_getaudit = `/api/mdc/cuc/carLicenseAudit/operate/get`;
|
||||
|
||||
// 获取车辆认证司机列表
|
||||
// $api_get_queryDriverByCarId = `/api/mdc/cuc/carLicenseAudit/operate/queryDriverByCarId`;
|
||||
$api_get_queryDriverByCarId = `/api/mdc/cuc/carLicenseAudit/operate/queryDriverByCarId`;
|
||||
// 详情需要的下拉框数据
|
||||
$api_get_getDictValue = `/api/mdc/pbc/dictItems/getDictValue`;
|
||||
|
||||
Reference in New Issue
Block a user