From f7628e9d1a706d626f02cd9d3163706dc95994a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= Date: Fri, 29 Apr 2022 18:05:41 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=BD=A6=E8=BE=86UI=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../complaint-detail.component.html | 69 ++- .../risk-detail/risk-detail.component.html | 42 +- .../risk-detail/risk-detail.component.ts | 83 ++- .../audit/detail/detail.component.html | 561 +++++++----------- .../audit/detail/detail.component.ts | 40 +- .../abnormal-appear.component.html | 18 +- src/styles/common/global.less | 3 + 7 files changed, 377 insertions(+), 439 deletions(-) diff --git a/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.html b/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.html index a9a97694..966ee006 100644 --- a/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.html +++ b/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.html @@ -1,5 +1,5 @@ - + - - -

投诉单号：{{datailList?.complaintCode}}

+ + +
+
+ + 投诉单号： : {{datailList?.complaintCode}} +
+
+ +
+
+ +
+ + 投诉信息 +
+ - + - + - - - - - -
{{i?.nodeNameLabel}}
-

- {{i?.timeLabel}}：{{i?.time}} -

-

- {{i?.resultLabel}}：{{i?.result}} -

- - + +
+ + 投诉处理 +
+ + +
{{i?.nodeNameLabel}}
+

+ {{i?.timeLabel}}：{{i?.time}} +

+

+ {{i?.resultLabel}}：{{i?.result}} +

+ + - + @@ -57,4 +76,4 @@ - \ No newline at end of file + 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 index 1ec6ca16..b5e4e9c7 100644 --- 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 @@ -1,5 +1,5 @@ + {{i?.driverName ? i?.driverName + '/': ''}} {{i?.driverPhone ?i?.driverPhone + '/': '' }} + {{i?.carNo}} + {{i?.carCaptainName ? i?.carCaptainName+ '/' : + ''}}{{i?.carCaptainPhone}} {{i?.loadTime}} {{i?.unloadTime}} {{i?.loadingPlace}} @@ -43,8 +56,13 @@ --> - - + +
+ + 申诉信息 +
+ - + - +

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

- 未上传 +
- - + - + *ngIf="detailData?.approvalStatus === 10 || detailData?.approvalStatus === '10'">驳回 + @@ -46,329 +41,243 @@ - - - 车辆基础信息 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - 行驶证信息 - - - - - - - - + + + + +
- - - - - - - - - + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - + + - - - - - - 道路运输证信息 - - - - - - - - - - - - - - - - + + + + - - - - - - 认证司机 - - - -
- 未上传 - 草稿 - 待审核 - 已审核 - 已驳回 - 证件过期 -
- - + "> + + + + +
+
+ + 认证司机 +
+ + +
+ 未上传 + 草稿 + 待审核 + 已审核 + 已驳回 + 证件过期 +
+ + +
-
+
{{ detailData?.carNo }} @@ -380,27 +289,15 @@ - +
上传
 -
+
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 c1e7047b..7b7ad35f 100644 --- a/src/app/routes/vehicle/components/audit/detail/detail.component.ts +++ b/src/app/routes/vehicle/components/audit/detail/detail.component.ts @@ -22,7 +22,7 @@ import { fromEvent, Subscription } from 'rxjs'; templateUrl: './detail.component.html', styleUrls: ['./detail.component.less'] }) -export class VehicleComponentsAuditDetailComponent implements OnInit, OnDestroy { +export class VehicleComponentsAuditDetailComponent implements OnInit, OnDestroy { @ViewChild('st', { static: false }) st!: STComponent; @ViewChild('redectModal', { static: false }) redectModal!: any; columns!: STColumn[]; @@ -36,8 +36,16 @@ export class VehicleComponentsAuditDetailComponent implements OnInit, OnDestroy approvalOpinion = ''; uploadURl = apiConf.waterFileUpload; disabledUpload = false; + carStatus: any = { + 1: '未上传', + 0: '草稿', + 10: '待审核', + 20: '已审核', + 30: '已驳回', + 40: '证件过期', + } + - scrollTop = 0; subscribeScoll!: Subscription; constructor( @@ -46,7 +54,7 @@ export class VehicleComponentsAuditDetailComponent implements OnInit, OnDestroy private nzModalService: NzModalService, private modal: ModalHelper, private nzImageService: NzImageService - ) {} + ) { } ngOnDestroy(): void { this.subscribeScoll.unsubscribe(); } @@ -63,9 +71,9 @@ export class VehicleComponentsAuditDetailComponent implements OnInit, OnDestroy initST() { this.columns = [ { title: '司机姓名', index: 'name', width: 150, className: 'text-center' }, - { title: '司机手机号', index: 'mobile', width: 200,className: 'text-center' }, + { title: '司机手机号', index: 'mobile', width: 200, className: 'text-center' }, { title: '身份证号', index: 'idCardNo', width: 200, className: 'text-center' }, - { title: '挂靠协议', render: 'auditStatusEnum', width: 100,className: 'text-center' }, + { title: '挂靠协议', render: 'auditStatusEnum', width: 100, className: 'text-center' }, { title: '车主申明/挂靠协议', fixed: 'right', @@ -152,14 +160,14 @@ export class VehicleComponentsAuditDetailComponent implements OnInit, OnDestroy this.detailData.roadTransportEndTime = EADateUtil.yearToDate(this.detailData?.roadTransportEndTime); console.log(this.detailData.roadTransportStartTime) - if((this.detailData.roadTransportStartTime > this.detailData.roadTransportEndTime) || (this.detailData.driverLicenseRegisterTime > this.detailData.driverLicenseEndTime)) { + if ((this.detailData.roadTransportStartTime > this.detailData.roadTransportEndTime) || (this.detailData.driverLicenseRegisterTime > this.detailData.driverLicenseEndTime)) { this.service.msgSrv.error('发证日期起始不能大于结束日期！') - return; + return; } this.service.request(this.service.$api_get_update_audit, this.detailData).subscribe(res => { if (res) { this.getDetailList(); - this.isEdit = false; + this.isEdit = false; this.service.msgSrv.success('修改成功！'); } }); @@ -271,14 +279,14 @@ export class VehicleComponentsAuditDetailComponent implements OnInit, OnDestroy // this.getDetailList(); // }); console.log(item); - - const params = { - imgList: [item.carProtocal], - index: 0 - }; - this.nzImageService.preview([{ src: item.carProtocal}]); - this.st.reload(); - this.getDetailList(); + + const params = { + imgList: [item.carProtocal], + index: 0 + }; + this.nzImageService.preview([{ src: item.carProtocal }]); + this.st.reload(); + this.getDetailList(); } updateEvaluate(item: any) { this.modal.createStatic(VehicleComponentsListEditComponent, { i: item }).subscribe(i => { diff --git a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html index fc3d8541..572ff89c 100644 --- a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html +++ b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html @@ -85,19 +85,19 @@
- + {{itemInfo.exceptionCode}} - + {{itemInfo.loadingAddressArr}} - + {{itemInfo.unloadingAddressArr}} - + {{itemInfo.exceptionContent}} - +
@@ -111,13 +111,13 @@
- + {{itemInfo.replyContent}} - + {{itemInfo.replyAppUserName}} - + {{itemInfo.replyTime}} @@ -135,4 +135,4 @@
- \ No newline at end of file + diff --git a/src/styles/common/global.less b/src/styles/common/global.less index c499a3a5..7e82d5a5 100644 --- a/src/styles/common/global.less +++ b/src/styles/common/global.less @@ -31,13 +31,16 @@ &.sv__horizontal { .sv__label-width { justify-content: left; + } } + } .new-sf-container { &.sf__horizontal .ant-form-item-label>label { justify-content: left; + color: rgba(0, 0, 0, 0.5); } } From 31d9eac5f081bcf54d8a66e7c79321e1caedff24 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 5 May 2022 10:23:24 +0800 Subject: [PATCH 2/2] edit --- .../freight/list/list.component.html | 51 +++++---- .../components/freight/list/list.component.ts | 105 ++++++------------ .../search-drawer.component.html | 3 +- .../search-drawer/search-drawer.component.ts | 3 +- 4 files changed, 68 insertions(+), 94 deletions(-) diff --git a/src/app/routes/usercenter/components/freight/list/list.component.html b/src/app/routes/usercenter/components/freight/list/list.component.html index f62797c1..c7f1462b 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.html +++ b/src/app/routes/usercenter/components/freight/list/list.component.html @@ -1,18 +1,6 @@ - - + -
@@ -32,10 +20,35 @@
- - - - + --> + + + +
+ +
+ + + + +
    +
  • + 新增企业 +
    • +
  • + 修改合伙人 +
    • +
  • + 修改渠道销售 +
    • +
+ +
+
+ @@ -78,11 +91,11 @@
- + \ No newline at end of file diff --git a/src/app/routes/usercenter/components/freight/list/list.component.ts b/src/app/routes/usercenter/components/freight/list/list.component.ts index d7d5860c..68658f98 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.ts +++ b/src/app/routes/usercenter/components/freight/list/list.component.ts @@ -2,8 +2,9 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { STChange, STColumn, STColumnBadge, STComponent, STData, STRequestOptions } from '@delon/abc/st'; import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form'; -import { DynamicSettingModalComponent, ShipperBaseService } from '@shared'; +import { DynamicSettingModalComponent, SearchDrawerService, ShipperBaseService } from '@shared'; import { NzModalService } from 'ng-zorro-antd/modal'; +import { BasicTableComponent } from 'src/app/routes/commom'; import { AccountDetailComponent } from 'src/app/shared/components/account-detail/account-detail.component'; import { UsermanageService } from '../../../services/usercenter.service'; import { EditPartnerComponentsAddComponent } from './editPartner/editPartner.component'; @@ -12,15 +13,11 @@ import { ShowServiceComponent } from './showService/showservice.component'; @Component({ selector: 'app-Freight-components-list', templateUrl: './list.component.html', - styleUrls: ['../../../../commom/less/expend-but.less'] + styleUrls: ['../../../../commom/less/commom-table.less'] }) -export class FreightComponentsListComponent implements OnInit { - _$expand = false; - ui!: SFUISchema; - schema!: SFSchema; +export class FreightComponentsListComponent extends BasicTableComponent implements OnInit { columns!: STColumn[]; @ViewChild('st', { static: false }) st!: STComponent; - @ViewChild('sf', { static: false }) sf!: SFComponent; @ViewChild('promoterModal', { static: false }) promoterModal!: any; @@ -32,8 +29,11 @@ export class FreightComponentsListComponent implements OnInit { private modal: NzModalService, private router: Router, private ar: ActivatedRoute, - public shipperservice: ShipperBaseService - ) {} + public shipperservice: ShipperBaseService, + public searchDrawerService: SearchDrawerService + ) { + super(searchDrawerService); + } ngOnInit() { this.initSF(); @@ -43,6 +43,10 @@ export class FreightComponentsListComponent implements OnInit { }); } + search() { + this.st?.load(1); + } + beforeReq = (requestOptions: STRequestOptions) => { Object.assign(requestOptions.body, { listSource: 1 }); if (this.sf) { @@ -129,9 +133,9 @@ export class FreightComponentsListComponent implements OnInit { return this.st?.list.filter(item => item.checked) || []; } editPartner(record?: any) { - let status = 1 - if(record) { - status = 2 + let status = 1; + if (record) { + status = 2; } if (this.selectedRows.length <= 0 && !record) { this.service.msgSrv.error('请选择订单！'); @@ -159,9 +163,9 @@ export class FreightComponentsListComponent implements OnInit { }); } editSale(record?: any) { - let status = 1 - if(record) { - status = 2 + let status = 1; + if (record) { + status = 2; } if (this.selectedRows.length <= 0 && !record) { this.service.msgSrv.error('请选择订单！'); @@ -237,10 +241,7 @@ export class FreightComponentsListComponent implements OnInit { enum: [{ label: '全部', value: '' }], default: '', ui: { - widget: 'select', - visibleIf: { - expand: (value: boolean) => value - } + widget: 'select' } }, oftenUsedServices: { @@ -253,10 +254,7 @@ export class FreightComponentsListComponent implements OnInit { ], default: '', ui: { - widget: 'select', - visibleIf: { - expand: (value: boolean) => value - } + widget: 'select' } }, customerType: { @@ -269,10 +267,7 @@ export class FreightComponentsListComponent implements OnInit { ], default: '', ui: { - widget: 'select', - visibleIf: { - expand: (value: boolean) => value - } + widget: 'select' } }, promotersTelephone: { @@ -280,10 +275,7 @@ export class FreightComponentsListComponent implements OnInit { type: 'string', ui: { placeholder: '请输入', - showRequired: false, - visibleIf: { - expand: (value: boolean) => value - } + showRequired: false } }, partnerNamee: { @@ -291,10 +283,7 @@ export class FreightComponentsListComponent implements OnInit { type: 'string', ui: { placeholder: '请输入', - showRequired: false, - visibleIf: { - expand: (value: boolean) => value - } + showRequired: false } }, customerServiceId: { @@ -302,10 +291,7 @@ export class FreightComponentsListComponent implements OnInit { type: 'string', ui: { placeholder: '请输入', - showRequired: false, - visibleIf: { - expand: (value: boolean) => value - } + showRequired: false } }, approvalUserName: { @@ -313,10 +299,7 @@ export class FreightComponentsListComponent implements OnInit { type: 'string', ui: { placeholder: '请输入', - showRequired: false, - visibleIf: { - expand: (value: boolean) => value - } + showRequired: false } }, createTime: { @@ -325,10 +308,7 @@ export class FreightComponentsListComponent implements OnInit { ui: { widget: 'sl-from-to-search', format: 'yyyy-MM-dd HH:mm:ss', - nzShowTime: true, - visibleIf: { - expand: (value: boolean) => value - } + nzShowTime: true } as SFDateWidgetSchema }, approvalTime: { @@ -337,10 +317,7 @@ export class FreightComponentsListComponent implements OnInit { ui: { widget: 'sl-from-to-search', format: 'yyyy-MM-dd HH:mm:ss', - nzShowTime: true, - visibleIf: { - expand: (value: boolean) => value - } + nzShowTime: true } as SFDateWidgetSchema }, lockedStatus: { @@ -353,10 +330,7 @@ export class FreightComponentsListComponent implements OnInit { ], default: '', ui: { - widget: 'select', - visibleIf: { - expand: (value: boolean) => value - } + widget: 'select' } }, source: { @@ -369,10 +343,7 @@ export class FreightComponentsListComponent implements OnInit { ], default: '', ui: { - widget: 'select', - visibleIf: { - expand: (value: boolean) => value - } + widget: 'select' } }, isExpired: { @@ -385,10 +356,7 @@ export class FreightComponentsListComponent implements OnInit { ], default: '', ui: { - widget: 'select', - visibleIf: { - expand: (value: boolean) => value - } + widget: 'select' } }, networkTransporter: { @@ -398,15 +366,11 @@ export class FreightComponentsListComponent implements OnInit { widget: 'select', placeholder: '请选择', allowClear: true, - asyncData: () => this.shipperservice.getNetworkFreightForwarder(), - visibleIf: { - expand: (value: boolean) => value - } + asyncData: () => this.shipperservice.getNetworkFreightForwarder() } } } }; - this.ui = { '*': { spanLabelFixed: 110, grid: { lg: 8, md: 12, sm: 12, xs: 24 }, enter: () => this.st.load() } }; } initST() { @@ -543,10 +507,6 @@ export class FreightComponentsListComponent implements OnInit { }); } - expandToggle() { - this._$expand = !this._$expand; - this.sf?.setValue('/expand', this._$expand); - } creat() { this.router.navigate(['./new'], { relativeTo: this.ar }); } @@ -566,7 +526,6 @@ export class FreightComponentsListComponent implements OnInit { */ resetSF() { this.sf.reset(); - this._$expand = false; this.st.reload(); } } diff --git a/src/app/shared/components/search-drawer/search-drawer.component.html b/src/app/shared/components/search-drawer/search-drawer.component.html index 2822fe11..e80aea74 100644 --- a/src/app/shared/components/search-drawer/search-drawer.component.html +++ b/src/app/shared/components/search-drawer/search-drawer.component.html @@ -9,7 +9,8 @@
- +
diff --git a/src/app/shared/components/search-drawer/search-drawer.component.ts b/src/app/shared/components/search-drawer/search-drawer.component.ts index 52a15e2f..f424f093 100644 --- a/src/app/shared/components/search-drawer/search-drawer.component.ts +++ b/src/app/shared/components/search-drawer/search-drawer.component.ts @@ -1,5 +1,6 @@ import { AfterViewInit, Component, OnInit, ViewChild } from '@angular/core'; import { SFComponent, SFSchema, SFUISchema } from '@delon/form'; +import { _HttpClient } from '@delon/theme'; import { Subject } from 'rxjs'; import { SearchDrawerService } from './search-drawer.service'; @@ -17,7 +18,7 @@ export class SearchDrawerComponent implements OnInit, AfterViewInit { defaultValue = {}; - constructor(public service: SearchDrawerService) {} + constructor(public service: SearchDrawerService, public http: _HttpClient) {} ngAfterViewInit(): void {} ngOnInit(): void {