From fc53095c172583582ae4f5238bc5fda6ee842130 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 16 Dec 2021 11:23:34 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../risk-detail/risk-detail.component.html | 46 ++++++ .../risk-detail/risk-detail.component.less | 10 ++ .../risk-detail/risk-detail.component.spec.ts | 24 +++ .../risk-detail/risk-detail.component.ts | 124 +++++++++++++++ .../components/risk/risk.component.html | 49 +++--- .../components/risk/risk.component.ts | 86 ++++++---- .../order-management-routing.module.ts | 4 +- .../order-management.module.ts | 2 + .../services/order-management.service.ts | 11 +- .../components/audit/audit.component.ts | 4 +- .../audit/detail/detail.component.html | 150 +++++++++++------- .../audit/detail/detail.component.less | 6 + .../audit/detail/detail.component.ts | 54 ++++++- .../list/detail/detail.component.html | 12 -- .../vehicle/services/vehicle.service.ts | 8 +- 15 files changed, 450 insertions(+), 140 deletions(-) create mode 100644 src/app/routes/order-management/components/risk-detail/risk-detail.component.html create mode 100644 src/app/routes/order-management/components/risk-detail/risk-detail.component.less create mode 100644 src/app/routes/order-management/components/risk-detail/risk-detail.component.spec.ts create mode 100644 src/app/routes/order-management/components/risk-detail/risk-detail.component.ts diff --git a/src/app/routes/order-management/components/risk-detail/risk-detail.component.html b/src/app/routes/order-management/components/risk-detail/risk-detail.component.html new file mode 100644 index 00000000..cccfbdc4 --- /dev/null +++ b/src/app/routes/order-management/components/risk-detail/risk-detail.component.html @@ -0,0 +1,46 @@ + + + + + + + + {{i?.billCode}} + {{i?.representationsStatus}} + {{i?.driverName}} / {{i?.driverPhoneNumber}} / {{i?.carId}} + {{i?.payeeName}} / {{i?.payeePhoneNumber}} + {{i?.loadTime}} + {{i?.unloadTime}} + {{i?.loadingPlace}} + {{i?.dischargePlace}} + +
+
{{item}}
+
+ + + + + + + + + + + + + + + + + 申诉成功 + 重新提交申诉申请
操作人员：张三
+ + 驳回
操作人员：张三
+ + 提交申诉申请
操作人员：张三
+ + + diff --git a/src/app/routes/order-management/components/risk-detail/risk-detail.component.less b/src/app/routes/order-management/components/risk-detail/risk-detail.component.less new file mode 100644 index 00000000..0df0abc9 --- /dev/null +++ b/src/app/routes/order-management/components/risk-detail/risk-detail.component.less @@ -0,0 +1,10 @@ +.info{ + color: #666; +} +:host{ + ::ng-deep{ + .dealBox .ant-card-body{ + width: 500px; + } + } +} \ No newline at end of file diff --git a/src/app/routes/order-management/components/risk-detail/risk-detail.component.spec.ts b/src/app/routes/order-management/components/risk-detail/risk-detail.component.spec.ts new file mode 100644 index 00000000..02ad6800 --- /dev/null +++ b/src/app/routes/order-management/components/risk-detail/risk-detail.component.spec.ts @@ -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; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ OrderManagementRiskDetailComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(OrderManagementRiskDetailComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/routes/order-management/components/risk-detail/risk-detail.component.ts b/src/app/routes/order-management/components/risk-detail/risk-detail.component.ts new file mode 100644 index 00000000..92de6393 --- /dev/null +++ b/src/app/routes/order-management/components/risk-detail/risk-detail.component.ts @@ -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) + } + +} diff --git a/src/app/routes/order-management/components/risk/risk.component.html b/src/app/routes/order-management/components/risk/risk.component.html index 88152010..9c18fcfd 100644 --- a/src/app/routes/order-management/components/risk/risk.component.html +++ b/src/app/routes/order-management/components/risk/risk.component.html @@ -1,7 +1,7 @@ - - - {{item.no}} + + + {{item?.billCode}} - - -
{{item.no}}
- - -
- {{item.no}} + +
+

{{i?.costName}}：¥{{i?.price}}

 - -
-

预付：¥200.00

-

到付：¥200.00

-

油卡：¥200.00

-

回单付：¥200.00

-

小计：¥200.00

-

附加费：¥200.00

+ +
+

货物名称：{{i?.goodsName}}

+

重量/体积：{{i?.weight}}吨/{{i?.volume}}方

+

车型/车长：{{i?.maxWeight}}/ {{i?.maxCube}}

 diff --git a/src/app/routes/order-management/components/risk/risk.component.ts b/src/app/routes/order-management/components/risk/risk.component.ts index 7b9cbda6..6cc59744 100644 --- a/src/app/routes/order-management/components/risk/risk.component.ts +++ b/src/app/routes/order-management/components/risk/risk.component.ts @@ -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: '操作', diff --git a/src/app/routes/order-management/order-management-routing.module.ts b/src/app/routes/order-management/order-management-routing.module.ts index 0b43e44c..302d7d3a 100644 --- a/src/app/routes/order-management/order-management-routing.module.ts +++ b/src/app/routes/order-management/order-management-routing.module.ts @@ -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({ diff --git a/src/app/routes/order-management/order-management.module.ts b/src/app/routes/order-management/order-management.module.ts index 19e9c478..7bf70cc9 100644 --- a/src/app/routes/order-management/order-management.module.ts +++ b/src/app/routes/order-management/order-management.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'; @@ -48,6 +49,7 @@ const COMPONENTS: Type[] = [ VehicleConfirReceiptComponent, VehicleSureDepartComponent, VehicleSureArriveComponent, + OrderManagementRiskDetailComponent ]; @NgModule({ diff --git a/src/app/routes/order-management/services/order-management.service.ts b/src/app/routes/order-management/services/order-management.service.ts index 8c1ce038..23652c74 100644 --- a/src/app/routes/order-management/services/order-management.service.ts +++ b/src/app/routes/order-management/services/order-management.service.ts @@ -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 @@ -20,7 +20,14 @@ export class SupplyManagementService extends BaseService { $api_get_getDriverInfo = `/api/mdc/cuc/user/getDriverInfo`; $api_del_driver = ``; // 获取货主企业列表 - public $api_getList = '/api/mdc/cuc/enterpriseInfo/cargoOwner/getList?_allow_anonymous=true'; + 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) } diff --git a/src/app/routes/vehicle/components/audit/audit.component.ts b/src/app/routes/vehicle/components/audit/audit.component.ts index 1e37f2b6..91b98077 100644 --- a/src/app/routes/vehicle/components/audit/audit.component.ts +++ b/src/app/routes/vehicle/components/audit/audit.component.ts @@ -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; diff --git a/src/app/routes/vehicle/components/audit/detail/detail.component.html b/src/app/routes/vehicle/components/audit/detail/detail.component.html index e8063b2c..fc2ca212 100644 --- a/src/app/routes/vehicle/components/audit/detail/detail.component.html +++ b/src/app/routes/vehicle/components/audit/detail/detail.component.html @@ -7,6 +7,7 @@ +

车牌号：{{detailData?.carNo}}

待审核
@@ -21,10 +22,10 @@
- {{ detailData?.carNoColor }} + {{ detailData?.approvalPassTime }} - {{ detailData?.carNoColor }} + {{ detailData?.saveUser }} @@ -35,34 +36,55 @@ 车辆基础信息 - - - - + + + - + + + - + + + - - - + [nzShowArrow]="isEdit" [nzDisabled]="!isEdit"> + + + + + + + + + + *ngTemplateOutlet="uploadTemplate;context:{image:detailData?.carFrontPhoto,key:'carFrontPhoto'}"> @@ -72,60 +94,66 @@ 行驶证信息 - - - + [placeholder]="isEdit?'':'-'"> + + + + + + + + + + + - - - - - - + + + + + [nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''"> - + - - - - + + + + + [placeholder]="isEdit?'':'-'"> + [placeholder]="isEdit?'':'-'"> + [placeholder]="isEdit?'':'-'"> - -
- - - - -
+ + + + + + @@ -133,24 +161,29 @@ 道路运输证信息 + [placeholder]="isEdit?'':'-'"> - + + + [nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''"> + + [nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''"> + - + *ngTemplateOutlet="uploadTemplate;context:{image:detailData?.roadTransportPhoto,key:'roadTransportPhoto'}"> + @@ -158,7 +191,8 @@ 认证司机
diff --git a/src/app/routes/vehicle/components/audit/detail/detail.component.less b/src/app/routes/vehicle/components/audit/detail/detail.component.less index 359085e7..e631b23b 100644 --- a/src/app/routes/vehicle/components/audit/detail/detail.component.less +++ b/src/app/routes/vehicle/components/audit/detail/detail.component.less @@ -105,4 +105,10 @@ line-height : 24px; letter-spacing: 0.7px; } +} +input { + width: 200px; +} +.sv__container { + padding-top: 10px; } \ No newline at end of file diff --git a/src/app/routes/vehicle/components/audit/detail/detail.component.ts b/src/app/routes/vehicle/components/audit/detail/detail.component.ts index bd3cec82..4f715697 100644 --- a/src/app/routes/vehicle/components/audit/detail/detail.component.ts +++ b/src/app/routes/vehicle/components/audit/detail/detail.component.ts @@ -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; + } } diff --git a/src/app/routes/vehicle/components/list/detail/detail.component.html b/src/app/routes/vehicle/components/list/detail/detail.component.html index b8fef1b0..b76d426f 100644 --- a/src/app/routes/vehicle/components/list/detail/detail.component.html +++ b/src/app/routes/vehicle/components/list/detail/detail.component.html @@ -95,18 +95,6 @@ - - - - - - diff --git a/src/app/routes/vehicle/services/vehicle.service.ts b/src/app/routes/vehicle/services/vehicle.service.ts index eb4b43a1..0ef7a203 100644 --- a/src/app/routes/vehicle/services/vehicle.service.ts +++ b/src/app/routes/vehicle/services/vehicle.service.ts @@ -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`;