diff --git a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html index b5a9f198..3f826f85 100644 --- a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html +++ b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html @@ -288,7 +288,7 @@
- diff --git a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts index f4a60d20..e0a0057f 100644 --- a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts +++ b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts @@ -76,8 +76,8 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit { schema: SFSchema = {}; ui: SFUISchema = {}; logColumns2: STColumn[] = [ - { title: '时间', index: 'parkBte' }, - { title: '地点', index: 'parkAdr' } + { title: '停车时间', index: 'parkBte' }, + { title: '停车地点', index: 'parkAdr' } ]; logColumns: STColumn[] = [ { title: '款项', index: 'expenseCodeLabel' }, diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html index 483095f1..de78de28 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-06 20:20:26 * @LastEditors : Shiming - * @LastEditTime : 2022-04-21 15:33:15 + * @LastEditTime : 2022-05-06 10:02:52 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -174,15 +174,11 @@ - + [nzBorderless]="true" class="mb0">
运费信息 @@ -291,7 +287,7 @@
- diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts index a54ddc67..98957f4b 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts @@ -40,8 +40,8 @@ export class OrderManagementBulkeDetailComponent implements OnInit { modalTitle: string = ''; isVisible = false; logColumns2: STColumn[] = [ - { title: '时间', index: 'parkBte' }, - { title: '地点', index: 'parkAdr' } + { title: '停车时间', index: 'parkBte' }, + { title: '停车地点', index: 'parkAdr' } ]; logColumns3: STColumn[] = [ { title: '时间', index: 'warningTime' }, diff --git a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html index 4cd328fd..873829d3 100644 --- a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html +++ b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html @@ -322,7 +322,7 @@
- diff --git a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts index 7e1f5a25..ee919886 100644 --- a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts +++ b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts @@ -90,8 +90,8 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit { mapList: any[] = []; //地图点位数据组 addressItems: any[] = []; //打点地址数据组 logColumns2: STColumn[] = [ - { title: '时间', index: 'parkBte' }, - { title: '地点', index: 'parkAdr' } + { title: '停车时间', index: 'parkBte' }, + { title: '停车地点', index: 'parkAdr' } ]; constructor( private route: ActivatedRoute, diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html index 62179383..7a96dafd 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html @@ -290,7 +290,7 @@
- diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts index c0f99450..abc951a5 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts @@ -46,8 +46,8 @@ export class OrderManagementVehicleDetailComponent implements OnInit { approvalLsit: any; isVisible = false; logColumns2: STColumn[] = [ - { title: '时间', index: 'parkBte', width: 120, className: 'text-center' }, - { title: '地点', index: 'parkAdr' } + { title: '停车时间', index: 'parkBte', width: 120, className: 'text-center' }, + { title: '停车地点', index: 'parkAdr' } ]; logColumns3: STColumn[] = [ { title: '时间', index: 'warningTime' }, diff --git a/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.html b/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.html index b37da5ec..b2e78101 100644 --- a/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.html +++ b/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.html @@ -12,7 +12,7 @@
- diff --git a/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.ts b/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.ts index 30bd5b74..b053449b 100644 --- a/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.ts +++ b/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.ts @@ -28,8 +28,8 @@ export class OneCarOrderViewtrackComponent implements OnInit { mapList: any[] = []; //地图点位数据组 addressItems: any[] = []; //打点地址数据组 logColumns2: STColumn[] = [ - { title: '时间', index: 'parkBte', width: 120, className: 'text-center' }, - { title: '地点', index: 'parkAdr',width: 120,className: 'text-center' } + { title: '停车时间', index: 'parkBte', width: 120, className: 'text-center' }, + { title: '停车地点', index: 'parkAdr',width: 120,className: 'text-center' } ]; pois: any[] = []; diff --git a/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts b/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts index 14ca253a..9de158b2 100644 --- a/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts +++ b/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts @@ -306,6 +306,7 @@ export class AddPersonalPartnerComponent { placeholder: '请选择城市(最多3个)', checkable: true, class: 'city-tree-select', + virtualHeight: '300px', asyncData: () => this.getRegionDetailByCode('').pipe( map((res: any) => diff --git a/src/app/routes/sys-setting/components/announcement-message/announcement-message.component.ts b/src/app/routes/sys-setting/components/announcement-message/announcement-message.component.ts index 1ed294e6..b1a8ca59 100644 --- a/src/app/routes/sys-setting/components/announcement-message/announcement-message.component.ts +++ b/src/app/routes/sys-setting/components/announcement-message/announcement-message.component.ts @@ -131,10 +131,10 @@ export class AnnouncementMessageComponent implements OnInit { // { label: '运营后台', value: this.envSrv.env.appId }, // { label: '货主后台', value: this.envSrv.env.HzappId }, // { label: '司机端', value: this.envSrv.env.sjappId } - { label: '全平台', value: 0}, - { label: '运营后台', value: 3}, - { label: '货主后台', value: 2 }, - { label: '司机端', value: 1 }, + { label: '全平台', value: '0'}, + { label: '运营后台', value: '3'}, + { label: '货主后台', value: '2' }, + { label: '司机端', value: '1' }, ], ui: { widget: 'select', diff --git a/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.ts b/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.ts index d4adde93..3365f721 100644 --- a/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.ts +++ b/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.ts @@ -25,7 +25,7 @@ export class BasicSettingComponent implements OnInit { configList: any = []; isCanSave = false; constructor(public service: SystemService, private acl: ACLService) { - this.isCanSave = !!acl.data.abilities?.find(a => a === 'SYSTEM-BASIC_SETTING-save'); + this.isCanSave = acl.data.full || !!acl.data.abilities?.find(a => a === 'SYSTEM-BASIC_SETTING-save'); } ngOnInit() { diff --git a/src/app/routes/usercenter/components/driver/driver.component.html b/src/app/routes/usercenter/components/driver/driver.component.html index 32666512..1d2d5780 100644 --- a/src/app/routes/usercenter/components/driver/driver.component.html +++ b/src/app/routes/usercenter/components/driver/driver.component.html @@ -1,17 +1,5 @@ - - - +
@@ -27,25 +15,40 @@
- - - - - - - + --> + + + +
+ + + + + + +
+ - - {{ item.promotersTelephone || '添加' }} + + + {{ + item.promotersTelephone + || '添加' }} + + + 添加 + + - {{ item?.carNo }} + {{ item?.carNo }} @@ -60,7 +63,11 @@
-
+
+ +
\ No newline at end of file diff --git a/src/app/routes/usercenter/components/driver/driver.component.ts b/src/app/routes/usercenter/components/driver/driver.component.ts index 9e97d181..d903300b 100644 --- a/src/app/routes/usercenter/components/driver/driver.component.ts +++ b/src/app/routes/usercenter/components/driver/driver.component.ts @@ -3,21 +3,19 @@ import { ActivatedRoute, Router } from '@angular/router'; import { STColumn, STColumnBadge, STComponent, STData } from '@delon/abc/st'; import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form'; import { ModalHelper } from '@delon/theme'; -import { DynamicSettingModalComponent } from '@shared'; +import { DynamicSettingModalComponent, SearchDrawerService } 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 { CarSettleAddDriverComponent } from './add-driver/add-driver.component'; @Component({ selector: 'app-usercenter-components-driver', - styleUrls: ['./driver.component.less'], + styleUrls: ['../../../commom/less/commom-table.less'], templateUrl: './driver.component.html' }) -export class UserCenterComponentsDriverComponent implements OnInit { - _$expand = false; +export class UserCenterComponentsDriverComponent extends BasicTableComponent implements OnInit { @ViewChild('st', { static: false }) st!: STComponent; - @ViewChild('sf', { static: false }) sf!: SFComponent; - ui: SFUISchema = { '*': { spanLabelFixed: 130, grid: { lg: 8, md: 12, sm: 12, xs: 24 }, enter: () => this.st.load() } }; schema: SFSchema = this.initSF(); columns: STColumn[] = this.initST(); @@ -31,8 +29,15 @@ export class UserCenterComponentsDriverComponent implements OnInit { private modal: NzModalService, private router: Router, private ar: ActivatedRoute, - private modalHelper: ModalHelper - ) {} + private modalHelper: ModalHelper, + public searchDrawerService: SearchDrawerService + ) { + super(searchDrawerService); + } + + search() { + this.st?.load(1); + } /** * 查询参数 @@ -127,18 +132,6 @@ export class UserCenterComponentsDriverComponent implements OnInit { }); } - expandToggle() { - this._$expand = !this._$expand; - this.sf?.setValue('/expand', this._$expand); - } - /** - * 重置表单 - */ - resetSF() { - this.sf.reset(); - this._$expand = false; - } - exportList() { const params = this.reqParams; this.service.downloadFile(this.service.$api_export_driver, { ...params, pageSize: -1 }); @@ -188,10 +181,7 @@ export class UserCenterComponentsDriverComponent implements OnInit { ], default: '', ui: { - widget: 'select', - visibleIf: { - expand: (value: boolean) => value - } + widget: 'select' } }, practiceSenioritLicenseStatus: { @@ -206,10 +196,7 @@ export class UserCenterComponentsDriverComponent implements OnInit { ], default: '', ui: { - widget: 'select', - visibleIf: { - expand: (value: boolean) => value - } + widget: 'select' } }, promotersTelephone: { @@ -217,10 +204,7 @@ export class UserCenterComponentsDriverComponent implements OnInit { type: 'string', maxLength: 11, ui: { - placeholder: '请输入手机号', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请输入手机号' } }, source: { @@ -234,10 +218,7 @@ export class UserCenterComponentsDriverComponent implements OnInit { ], default: '', ui: { - widget: 'select', - visibleIf: { - expand: (value: boolean) => value - } + widget: 'select' } }, effectiveDate: { @@ -246,10 +227,7 @@ export class UserCenterComponentsDriverComponent implements OnInit { ui: { widget: 'date', mode: 'range', - format: 'yyyy-MM-dd', - visibleIf: { - expand: (value: boolean) => value - } + format: 'yyyy-MM-dd' } as SFDateWidgetSchema } } @@ -304,7 +282,7 @@ export class UserCenterComponentsDriverComponent implements OnInit { '-1': { text: '未提交', color: 'default' }, 1: { text: '已提交', color: 'processing' }, 2: { text: '已通过', color: 'success' }, - 3: { text: '已过期', color: 'error' }, + 3: { text: '已过期', color: 'error' } // 10: { text: '待审核', color: 'default' }, // 20: { text: '审核通过', color: 'success' }, // 30: { text: '驳回', color: 'warning' }, diff --git a/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.html b/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.html index 5f0d740a..5e2b9238 100644 --- a/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.html +++ b/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.html @@ -27,7 +27,7 @@
- + diff --git a/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.html b/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.html index e590f998..12b02806 100644 --- a/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.html +++ b/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.html @@ -1,16 +1,5 @@ - - +
导出 -
- - + --> + + +
+ +
+
+ 已选择 + {{ selectedRows.length }} 条数据 + 清空 +
+ + + + +
    +
  • + 修改角色 +
    • +
  • + 修改网络货运人 +
    • +
+ +
+ diff --git a/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts b/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts index 26add0e2..9574f30a 100644 --- a/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts +++ b/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts @@ -2,21 +2,21 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { Router, ActivatedRoute } from '@angular/router'; import { STColumn, STComponent, STRequestOptions, STData, STChange } from '@delon/abc/st'; import { SFUISchema, SFSchema, SFComponent, SFDateWidgetSchema } from '@delon/form'; -import { ShipperBaseService, DynamicSettingModalComponent } from '@shared'; +import { ShipperBaseService, DynamicSettingModalComponent, SearchDrawerService } 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'; @Component({ selector: 'app-freight-config', templateUrl: './freight-config.component.html', - styleUrls: ['../../../../commom/less/box.less', '../../../../commom/less/expend-but.less'] + styleUrls: ['../../../../commom/less/commom-table.less'] }) -export class FreightConfigComponent implements OnInit { +export class FreightConfigComponent extends BasicTableComponent implements OnInit { schema: SFSchema = this.initSF(); columns: STColumn[] = this.initST(); @ViewChild('st', { static: false }) st!: STComponent; - @ViewChild('sf', { static: false }) sf!: SFComponent; selectedRows: any[] = []; @ViewChild('IWModal', { static: false }) @@ -27,8 +27,18 @@ export class FreightConfigComponent implements OnInit { roles: any = []; networkTransporter = null; roleId = null; - _$expand = false; - constructor(public service: UsermanageService, private modal: NzModalService, public shipperservice: ShipperBaseService) {} + constructor( + public service: UsermanageService, + private modal: NzModalService, + public shipperservice: ShipperBaseService, + public searchDrawerService: SearchDrawerService + ) { + super(searchDrawerService); + } + + search() { + this.st?.load(1); + } ngOnInit() { this.initST(); @@ -191,21 +201,6 @@ export class FreightConfigComponent implements OnInit { }); } - /** - * 伸缩查询条件 - */ - expandToggle(): void { - this._$expand = !this._$expand; - this.sf?.setValue('/_$expand', this._$expand); - } - /** - * 重置表单 - */ - resetSF(): void { - this.sf.reset(); - this._$expand = false; - } - private initSF(): SFSchema { return { properties: { @@ -235,7 +230,7 @@ export class FreightConfigComponent implements OnInit { widget: 'sl-from-to-search', format: 'yyyy-MM-dd', placeholder: '请选择', - nzShowTime: true, + nzShowTime: true } as SFDateWidgetSchema } } 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 a1d88f29..2d8995c3 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.ts +++ b/src/app/routes/usercenter/components/freight/list/list.component.ts @@ -339,7 +339,8 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen enum: [ { label: '全部', value: '' }, { label: '货主注册', value: 1 }, - { label: '平台添加', value: 2 } + { label: '平台添加', value: 2 }, + { label: '数据迁移', value: 4 }, ], default: '', ui: { @@ -411,7 +412,7 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen className: 'text-center', index: 'source', type: 'enum', - enum: { 1: '货主注册', 2: '平台添加', 3: '运营添加' }, + enum: { 1: '货主注册', 2: '平台添加', 3: '运营添加', 4: '数据迁移' }, width: 130 }, { title: '申请时间', className: 'text-center', index: 'createTime', width: 180, type: 'date' }, diff --git a/src/app/routes/usercenter/components/freight/user/user.component.html b/src/app/routes/usercenter/components/freight/user/user.component.html index 77115d8f..e94a51d0 100644 --- a/src/app/routes/usercenter/components/freight/user/user.component.html +++ b/src/app/routes/usercenter/components/freight/user/user.component.html @@ -19,7 +19,7 @@
- + diff --git a/src/app/routes/usercenter/usercenter-routing.module.ts b/src/app/routes/usercenter/usercenter-routing.module.ts index 5cbf597a..53be222d 100644 --- a/src/app/routes/usercenter/usercenter-routing.module.ts +++ b/src/app/routes/usercenter/usercenter-routing.module.ts @@ -44,7 +44,8 @@ const routes: Routes = [ }, { path: 'freight/config', - component: FreightConfigComponent + component: FreightConfigComponent, + data: { guard: { ability: ['USERCENTER-FREIGHT-CONFIG-list'] } } }, { path: 'freight/user', component: FreightComponentsUserComponent, data: { guard: { ability: ['USERCENTER-FREIGHT-USER-list'] } } }, { 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 187882d1..212d273e 100644 --- a/src/app/routes/vehicle/components/list/detail/detail.component.html +++ b/src/app/routes/vehicle/components/list/detail/detail.component.html @@ -190,7 +190,6 @@ {{detailData?.carOwner }} - <<<<<<< HEAD=======>>>>>>> 6d503f57e2434e5c0a0baa406ac42fe2b7a8a9b5 diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html index bff8ed33..c62d42f6 100644 --- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html @@ -274,7 +274,7 @@
- diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts index 9adba23c..9b8121a9 100644 --- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts +++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts @@ -38,8 +38,8 @@ export class WaybillManagementBulkeDetailComponent implements OnInit { modalTitle: string = ''; unLoadingPlaceVOList: any = []; logColumns2: STColumn[] = [ - { title: '时间', index: 'parkBte' }, - { title: '地点', index: 'parkAdr' } + { title: '停车时间', index: 'parkBte' }, + { title: '停车地点', index: 'parkAdr' } ]; logColumns: STColumn[] = [ { title: '款项', index: 'costCodeLabel' }, diff --git a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html index eaaba227..8174c36f 100644 --- a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html @@ -1,7 +1,7 @@