diff --git a/src/app/routes/order-management/components/bulk/bulk.component.html b/src/app/routes/order-management/components/bulk/bulk.component.html index 4a05bdfb..5537afc3 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.html +++ b/src/app/routes/order-management/components/bulk/bulk.component.html @@ -1,7 +1,7 @@ - + - {{item.no}} + {{item.id}} - + - {{item.no}} + {{item.id}}

预付:¥200.00

diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.ts index 70cb334a..77d6950b 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -48,11 +48,6 @@ export class OrderManagementVehicleComponent implements OnInit { type: 5, count: 0, }, - { - name: '待接单', - type: 5, - count: 0, - }, { name: '待发车', type: 5, @@ -118,7 +113,7 @@ export class OrderManagementVehicleComponent implements OnInit { }, no1: { type: 'string', - title: '托运人' + title: '货主' }, no3: { type: 'string', @@ -158,7 +153,7 @@ export class OrderManagementVehicleComponent implements OnInit { }, no10: { type: 'string', - title: '收款人', + title: '车队长', ui: { visibleIf: { _$expand: (value: boolean) => value, @@ -207,6 +202,57 @@ export class OrderManagementVehicleComponent implements OnInit { asyncData: () => this.getCatalogueMember(), }, }, + sex3: { + title: '网络货运人', + type: 'string', + default: 0, + enum: [ + { label: '未知', value: 0 }, + { label: '男', value: 1 }, + { label: '女', value: 2 }, + { label: '保密', value: 3 }, + ], + ui: { + widget: 'select', + visibleIf: { + _$expand: (value: boolean) => value, + }, + } as SFSelectWidgetSchema, + }, + sex4: { + title: '货物名称', + type: 'string', + default: 0, + enum: [ + { label: '未知', value: 0 }, + { label: '男', value: 1 }, + { label: '女', value: 2 }, + { label: '保密', value: 3 }, + ], + ui: { + widget: 'select', + visibleIf: { + _$expand: (value: boolean) => value, + }, + } as SFSelectWidgetSchema, + }, + sex5: { + title: '服务类型', + type: 'string', + default: 0, + enum: [ + { label: '未知', value: 0 }, + { label: '男', value: 1 }, + { label: '女', value: 2 }, + { label: '保密', value: 3 }, + ], + ui: { + widget: 'select', + visibleIf: { + _$expand: (value: boolean) => value, + }, + } as SFSelectWidgetSchema, + }, }, type: 'object', }; @@ -219,18 +265,23 @@ export class OrderManagementVehicleComponent implements OnInit { initST() { this.columns = [ { title: '', type: 'checkbox', width: '50px', className: 'text-center' }, + { - title: '运单号', + title: '订单号', width: '100px', className: 'text-center', render: 'goodsId' }, { - title: '货源编号', + title: '运费明细', width: '100px', className: 'text-center', + index: 'externalSn', }, - { title: '托运人', index: 'externalSn', width: '120px', className: 'text-center' }, + { title: '网络货运人', index: 'externalSn', width: '120px', className: 'text-center' }, + { title: '货主', index: 'externalSn', width: '120px', className: 'text-center' }, + { title: '关联运单号', index: 'linkUrl', width: '120px', className: 'text-center' }, + { title: '货源编号', index: 'linkUrl', width: '120px', className: 'text-center' }, { title: '装货地', index: 'linkUrl', width: '120px', className: 'text-center' }, { title: '卸货地', @@ -238,38 +289,16 @@ export class OrderManagementVehicleComponent implements OnInit { width: '120px', }, { - title: '货物名称', + title: '货物信息', className: 'text-center', width: '120px', }, { - title: '重量/体积', - className: 'text-center', - width: '120px', - }, - { title: '承运司机', className: 'text-center', width: '120px', }, { - title: '车牌号', - className: 'text-center', - width: '120px', - }, - { - title: '出价', - className: 'text-center', - width: '120px', - render: 'enStatusStr27878' - }, - { - title: '浮动费用', - className: 'text-center', - width: '120px', - render: 'feiong' - }, - { - title: '成交金额', + title: '承运司机', className: 'text-center', width: '120px', }, @@ -286,7 +315,7 @@ export class OrderManagementVehicleComponent implements OnInit { }, }, { - title: '支付状态', + title: '装卸货时间', width: '170px', className: 'text-center', }, @@ -294,48 +323,20 @@ export class OrderManagementVehicleComponent implements OnInit { title: '创建时间', className: 'text-center', index: 'enStatusStr3', - type: 'badge', - width: '100px', - badge: { - 正常: { text: '正常', color: 'success' }, - 冻结: { text: '冻结', color: 'warning' }, - 废弃: { text: '废弃', color: 'default' }, - }, - }, - { - title: '异常原因', - className: 'text-center', - index: 'enStatusStr3', - type: 'badge', - width: '100px', - badge: { - 正常: { text: '正常', color: 'success' }, - 冻结: { text: '冻结', color: 'warning' }, - 废弃: { text: '废弃', color: 'default' }, - }, - }, - { - title: '运单状态', - className: 'text-center', - index: 'enStatusStr3', - type: 'badge', - width: '100px', - badge: { - 正常: { text: '正常', color: 'success' }, - 冻结: { text: '冻结', color: 'warning' }, - 废弃: { text: '废弃', color: 'default' }, - }, }, { title: '操作', fixed: 'right', width: '200px', - className: 'text-left', buttons: [ { text: '查看评价', click: (_record) => this.viewEvaluate(_record), }, + { + text: '运费变更记录', + click: (_record) => this.OpenPrice(), + }, ], }, ]; diff --git a/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.html b/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.html new file mode 100644 index 00000000..dc976583 --- /dev/null +++ b/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.html @@ -0,0 +1,67 @@ + + + + + + 100元/吨 + 100元/方 + 100元/车 + + +
+
以发货为准 / 以收货为准
+
保留小数/抹除小数/抹除个数
+
+
+ +
+ + +
xx吨
+
+ +
xx吨
+
+
+ + +
xx吨
+
+ +
xx吨
+
+
+ + +
1000元
+
+ +
张三 / 18888888888 / 粤GJ401
+
+ +
李四 / 1888888888
+
+ + + +
+ diff --git a/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.less b/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.less new file mode 100644 index 00000000..30444d6b --- /dev/null +++ b/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.less @@ -0,0 +1,7 @@ + .left_btn { + width: 50px; + height: 32px; + padding-left: 8px; + line-height:32px; + background-color: #d7d7d7; + } \ No newline at end of file diff --git a/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.ts b/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.ts new file mode 100644 index 00000000..381b694e --- /dev/null +++ b/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.ts @@ -0,0 +1,53 @@ +import { preloaderFinished } from '@delon/theme'; +/* + * @Author: your name + * @Date: 2021-12-14 14:03:07 + * @LastEditTime: 2021-12-14 15:43:12 + * @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\modal\bulk\update-freight\update-freight.component.ts + */ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { + SFComponent, + SFCustomWidgetSchema, + SFNumberWidgetSchema, + SFRadioWidgetSchema, + SFSchema, + SFSelectWidgetSchema, + SFTextareaWidgetSchema, + SFUISchema +} from '@delon/form'; +import { _HttpClient } from '@delon/theme'; +import { NzMessageService } from 'ng-zorro-antd/message'; +import { NzModalRef } from 'ng-zorro-antd/modal'; + +@Component({ + selector: 'app-order-management-confir-receipt', + templateUrl: './confir-receipt.component.html', + styleUrls: ['./confir-receipt.component.less'] +}) +export class ConfirReceiptComponent implements OnInit { + record: any = {}; + i:any; + data: any = {}; + constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public http: _HttpClient) {} + + ngOnInit(): void { + } + + save(): void { + // this.http.post(`/user/${this.record.id}`, value).subscribe(res => { + // this.msgSrv.success('保存成功'); + // this.modal.close(true); + // }); + } + + close(): void { + this.modal.destroy(); + } + userAction() { + + } + +} diff --git a/src/app/routes/order-management/modal/bulk/sure-depart/sure-depart.component.html b/src/app/routes/order-management/modal/bulk/sure-depart/sure-depart.component.html new file mode 100644 index 00000000..83d05416 --- /dev/null +++ b/src/app/routes/order-management/modal/bulk/sure-depart/sure-depart.component.html @@ -0,0 +1,16 @@ + + + + diff --git a/src/app/routes/order-management/modal/bulk/sure-depart/sure-depart.component.less b/src/app/routes/order-management/modal/bulk/sure-depart/sure-depart.component.less new file mode 100644 index 00000000..30444d6b --- /dev/null +++ b/src/app/routes/order-management/modal/bulk/sure-depart/sure-depart.component.less @@ -0,0 +1,7 @@ + .left_btn { + width: 50px; + height: 32px; + padding-left: 8px; + line-height:32px; + background-color: #d7d7d7; + } \ No newline at end of file diff --git a/src/app/routes/order-management/modal/bulk/sure-depart/sure-depart.component.ts b/src/app/routes/order-management/modal/bulk/sure-depart/sure-depart.component.ts new file mode 100644 index 00000000..e27edcf9 --- /dev/null +++ b/src/app/routes/order-management/modal/bulk/sure-depart/sure-depart.component.ts @@ -0,0 +1,139 @@ +import { preloaderFinished } from '@delon/theme'; +/* + * @Author: your name + * @Date: 2021-12-14 14:03:07 + * @LastEditTime: 2021-12-14 16:00:05 + * @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\modal\bulk\update-freight\update-freight.component.ts + */ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { + SFComponent, + SFCustomWidgetSchema, + SFDateWidgetSchema, + SFNumberWidgetSchema, + SFRadioWidgetSchema, + SFSchema, + SFSelectWidgetSchema, + SFTextareaWidgetSchema, + SFUISchema, + SFUploadWidgetSchema +} from '@delon/form'; +import { _HttpClient } from '@delon/theme'; +import { NzMessageService } from 'ng-zorro-antd/message'; +import { NzModalRef } from 'ng-zorro-antd/modal'; +import { SupplyManagementService } from 'src/app/routes/supply-management/services/supply-management.service'; +import { Observable, Observer } from 'rxjs'; + +@Component({ + selector: 'app-order-management-sure-depart', + templateUrl: './sure-depart.component.html', + styleUrls: ['./sure-depart.component.less'] +}) +export class SureDepartComponent implements OnInit { + record: any = {}; + i: any; + @ViewChild('sf', { static: false }) sf!: SFComponent; + schema: SFSchema = {}; + ui: SFUISchema = {}; + constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public http: _HttpClient, public service: SupplyManagementService ) {} + + ngOnInit(): void { + this.initSF(); + } + initSF() { + this.schema = { + properties: { + createTime: { + title: '创建时间', + type: 'string', + ui: { + widget: 'date', + mode: 'range', + format: 'yyyy-MM-dd', + visibleIf: { + expand: (value: boolean) => value, + }, + } as SFDateWidgetSchema, + }, + name3: { + type: 'string', + title: '投诉详情', + maxLength: 100, + ui: { + widget: 'textarea', + autosize: { minRows: 4, maxRows: 6 } + } as SFTextareaWidgetSchema + }, + avatar: { + type: 'string', + title: '上传凭证', + ui: { + action: `/scm/cms/cms/upload/multipartFile/fileModel`, + fileType: 'image/png,image/jpeg,image/jpg', + limit: 5, + limitFileCount: 5, + resReName: 'url', + urlReName: 'url', + widget: 'upload', + descriptionI18n: '不超过5张,单张大小不超过5M,支持.jpg、.jpeg和 .png格式', + data: { + // appId: environment.appId, + }, + name: 'multipartFile', + multiple: true, + listType: 'picture-card', + change: (args: any) => { + if (args.type === 'success') { + const avatar = [ + { + uid: -1, + name: 'LOGO', + status: 'done', + url: args.fileList[0].response.url, + response: { + url: args.fileList[0].response.url + } + } + ]; + this.sf?.setValue('/avatar', avatar); + } + }, + beforeUpload: (file: any, _fileList: any) => { + return new Observable((observer: Observer) => { + const isLt2M = file.size / 1024 / 1024 < 1; + if (!isLt2M) { + this.service.msgSrv.warning('图片大小超过5M!'); + observer.complete(); + return; + } + observer.next(isLt2M); + observer.complete(); + }); + } + } as SFUploadWidgetSchema + } + }, + required: ['reason'] + }; + this.ui = { + '*': { + spanLabelFixed: 100, + grid: { span: 20 } + } + }; + } + save(value: any): void { + console.log(value) + // this.http.post(`/user/${this.record.id}`, value).subscribe(res => { + // this.msgSrv.success('保存成功'); + // this.modal.close(true); + // }); + } + + close(): void { + this.modal.destroy(); + } + +} diff --git a/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.html b/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.html new file mode 100644 index 00000000..b52bb931 --- /dev/null +++ b/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.html @@ -0,0 +1,53 @@ + + + + +
+ +
元/吨
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ +
+

总运费:¥900.00

+

运输费:¥800.00,附加费:¥100.00

+
+ + diff --git a/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.less b/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.less new file mode 100644 index 00000000..30444d6b --- /dev/null +++ b/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.less @@ -0,0 +1,7 @@ + .left_btn { + width: 50px; + height: 32px; + padding-left: 8px; + line-height:32px; + background-color: #d7d7d7; + } \ No newline at end of file diff --git a/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts b/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts new file mode 100644 index 00000000..afad8c66 --- /dev/null +++ b/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts @@ -0,0 +1,143 @@ +import { preloaderFinished } from '@delon/theme'; +/* + * @Author: your name + * @Date: 2021-12-14 14:03:07 + * @LastEditTime: 2021-12-14 15:16:27 + * @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\modal\bulk\update-freight\update-freight.component.ts + */ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { + SFComponent, + SFCustomWidgetSchema, + SFNumberWidgetSchema, + SFRadioWidgetSchema, + SFSchema, + SFSelectWidgetSchema, + SFTextareaWidgetSchema, + SFUISchema +} from '@delon/form'; +import { _HttpClient } from '@delon/theme'; +import { NzMessageService } from 'ng-zorro-antd/message'; +import { NzModalRef } from 'ng-zorro-antd/modal'; + +@Component({ + selector: 'app-order-management-update-freight', + templateUrl: './update-freight.component.html', + styleUrls: ['./update-freight.component.less'] +}) +export class UpdateFreightComponent implements OnInit { + record: any = {}; + i: any; + @ViewChild('sf', { static: false }) sf!: SFComponent; + schema: SFSchema = {}; + ui: SFUISchema = {}; + data: any = {}; + constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public http: _HttpClient) {} + + ngOnInit(): void { + this.initSF(); + + if (this.record.id > 0) this.http.get(`/user/${this.record.id}`).subscribe(res => (this.i = res)); + } + initSF() { + this.schema= { + properties: { + no: { + type: 'string', + title: '运费单价', + ui: { + widget: 'custom', + } + }, + sex: { + title: '', + type: 'string', + enum: [ + { label: '保留小数', value: 0 }, + { label: '男', value: 1 }, + { label: '女', value: 2 }, + { label: '保密', value: 3 }, + ], + ui: { + widget: 'select', + } as SFSelectWidgetSchema, + }, + appId: { + type: 'string', + title: '结算依据', + ui: { + width: 300, + grid: { span: 24 }, + widget: 'select', + placeholder: '请选择', + allowClear: true, + // asyncData: () => this.getCatalogueMember(), + }, + }, + no2: { + type: 'string', + title: '装货重量', + ui: { + widget: 'custom', + } + }, + no3: { + type: 'string', + title: '装货体积', + ui: { + widget: 'custom', + } + }, + no4: { + type: 'string', + title: '卸货重量', + ui: { + widget: 'custom', + } + }, + no5: { + type: 'string', + title: '卸货体积', + ui: { + widget: 'custom', + } + }, + name3: { + type: 'string', + title: '变更原因', + maxLength: 100, + ui: { + width: 300, + placeholder:"选填,最多不超过100字", + widget: 'textarea', + autosize: { minRows: 3, maxRows: 6 } + } as SFTextareaWidgetSchema + }, + }, + required: ['no', 'appId'], + type: 'object', + }; + this.ui = { '*': { spanLabelFixed: 100, grid: { span: 12, gutter: 4 } } + }; + } + save(value: any): void { + console.log(value) + console.log(this.data) + this.http.post(`/user/${this.record.id}`, value).subscribe(res => { + this.msgSrv.success('保存成功'); + this.modal.close(true); + }); + } + + close(): void { + this.modal.destroy(); + } + /** + * 更新数字框 + * @param value + * @param type + */ + changeNumVal(value: any, type: number) {} +} diff --git a/src/app/routes/order-management/order-management.module.ts b/src/app/routes/order-management/order-management.module.ts index c4f4d812..97d89f51 100644 --- a/src/app/routes/order-management/order-management.module.ts +++ b/src/app/routes/order-management/order-management.module.ts @@ -1,8 +1,8 @@ /* * @Author: your name * @Date: 2021-12-03 15:31:52 - * @LastEditTime: 2021-12-07 14:11:17 - * @LastEditors: your name + * @LastEditTime: 2021-12-14 15:55:50 + * @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.module.ts */ @@ -19,6 +19,9 @@ import { OrderManagementRiskComponent } from './components/risk/risk.component'; import { OrderManagementVehicleDetailComponent } from './components/vehicle-detail/vehicle-detail.component'; import { OrderManagementVehicleComponent } from './components/vehicle/vehicle.component'; +import { ConfirReceiptComponent } from './modal/bulk/confir-receipt/confir-receipt.component'; +import { SureDepartComponent } from './modal/bulk/sure-depart/sure-depart.component'; +import { UpdateFreightComponent } from './modal/bulk/update-freight/update-freight.component'; import { OrderManagementRoutingModule } from './order-management-routing.module'; const COMPONENTS: Type[] = [ @@ -31,7 +34,10 @@ const COMPONENTS: Type[] = [ OrderManagementAdditionalcComponent, OrderManagementAdditionalcDetailComponent, OrderManagementRiskComponent, - OrderManagementComplaintComponent + OrderManagementComplaintComponent, + UpdateFreightComponent, + ConfirReceiptComponent, + SureDepartComponent ]; @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 80882fb7..e3340610 100644 --- a/src/app/routes/order-management/services/order-management.service.ts +++ b/src/app/routes/order-management/services/order-management.service.ts @@ -1,3 +1,11 @@ +/* + * @Author: your name + * @Date: 2021-12-03 15:31:52 + * @LastEditTime: 2021-12-14 10:14:22 + * @LastEditors: your name + * @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 + */ import { Injectable, Injector } from '@angular/core'; import { BaseService } from 'src/app/shared/services'; @@ -7,6 +15,7 @@ import { BaseService } from 'src/app/shared/services'; export class SupplyManagementService extends BaseService { $api_get_catalogue_member = `/user?_allow_anonymous=true`; + $api_get_bulkPage_list = `/api/sdc/goodsResourceOperate/listBulkPage`; $api_del_driver = ``; constructor(public injector: Injector) { super(injector) diff --git a/src/app/routes/supply-management/components/bulk/bulk.component.ts b/src/app/routes/supply-management/components/bulk/bulk.component.ts index b12bcfdb..ff3c31c0 100644 --- a/src/app/routes/supply-management/components/bulk/bulk.component.ts +++ b/src/app/routes/supply-management/components/bulk/bulk.component.ts @@ -428,4 +428,7 @@ handleOK() { } }) } + userAction() { + + } } diff --git a/src/app/routes/vehicle/components/list/list.component.ts b/src/app/routes/vehicle/components/list/list.component.ts index 90554701..49c92904 100644 --- a/src/app/routes/vehicle/components/list/list.component.ts +++ b/src/app/routes/vehicle/components/list/list.component.ts @@ -3,6 +3,7 @@ import { ActivatedRoute, Router } from '@angular/router'; import { STColumn, STColumnBadge, STComponent, STData } from '@delon/abc/st'; import { SFComponent, SFSchema, SFUISchema } from '@delon/form'; import { NzModalService } from 'ng-zorro-antd/modal'; +import { format } from 'path'; import { VehicleService } from '../../../vehicle/services/vehicle.service'; @Component({ selector: 'app-Vehicle-components-list', @@ -69,31 +70,17 @@ export class VehicleComponentsListComponent implements OnInit { }, }, carNo: { title: '车牌号', type: 'string', ui: { showRequired: false } }, - carLength: { - title: '车型车长载重', - type: 'string', - ui: { - showRequired: false, - }, - }, - - enStatus: { - type: 'string', - title: '运营状态', - enum: [ - { label: '全部', value: '' }, - { label: '正常', value: 0 }, - { label: '冻结', value: 1 }, - { label: '废弃', value: 2 }, - ], - default: '', - ui: { - widget: 'select', - }, - }, carNoColor: { type: 'string', title: '车牌颜色', + ui: { + widget: 'dict-select', + params: { dictKey: 'CarColor' }, + }, + }, + carLength2: { + title: '运营状态', + type: 'string', ui: { widget: 'dict-select', params: { dictKey: 'CarColor' }, @@ -102,9 +89,49 @@ export class VehicleComponentsListComponent implements OnInit { }, }, }, + carModel: { + title: '车型', + type: 'string', + ui: { + widget: 'dict-select', + params: { dictKey: 'CarColor' }, + visibleIf: { + expand: (value: boolean) => value, + }, + }, + }, + carLength: { + title: '车长', + type: 'string', + ui: { + widget: 'dict-select', + params: { dictKey: 'CarColor' }, + visibleIf: { + expand: (value: boolean) => value, + }, + }, + }, + carLoad: { + title: '载重', + type: 'string', + visibleIf: { + expand: (value: boolean) => value, + }, + }, + isTrailer: { + type: 'string', + title: '是否挂靠', + ui: { + widget: 'dict-select', + params: { dictKey: 'Whether' }, + visibleIf: { + expand: (value: boolean) => value, + }, + }, + }, isDriverLicenseExpire: { type: 'string', - title: '到期状态', + title: '行驶证到期状态', enum: [ { label: '正常', value: 0 }, { label: '冻结', value: 1 }, @@ -118,9 +145,20 @@ export class VehicleComponentsListComponent implements OnInit { }, }, }, + isRoadTransportExpire: { + type: 'string', + title: '驾驶证到期状态', + ui: { + widget: 'dict-select', + params: { dictKey: 'CarColor' }, + visibleIf: { + expand: (value: boolean) => value, + }, + }, + }, }, }; - this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 }, enter: () => this.st.load() } }; + this.ui = { '*': { spanLabelFixed: 130, grid: { span: 8, gutter: 4 }, enter: () => this.st.load() } }; } initST() { @@ -157,6 +195,10 @@ export class VehicleComponentsListComponent implements OnInit { true: { text: '是', color: 'warning' }, }, }, + { title: '所有人', className: 'text-center', index: 'carOwner' }, + { title: '是否挂靠', className: 'text-center', index: 'isTrailer', }, + { title: '挂靠协议', className: 'text-center', index: 'carNo' }, + { title: '操作', width: '170px', diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json index ec12cc51..15f3aad9 100644 --- a/src/assets/mocks/menu-data.json +++ b/src/assets/mocks/menu-data.json @@ -278,12 +278,12 @@ "group": true, "children": [ { - "text": "车辆管理", + "text": "车辆列表", "link": "/vehicle/list" }, { "hide": true, - "text": "车辆详情", + "text": "车辆列表详情", "link": "/vehicle/list/detail/:id" }, {