diff --git a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts index 0ccfd57d..55fb8aa8 100644 --- a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts +++ b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts @@ -468,8 +468,10 @@ export class DatatableFundReportingComponent implements OnInit { routeToOrder(item: any) { if (item.orderType === '1') { window.open(location.origin + `/#/order-management/vehicle/vehicle-detail/${item.orderId}`); - } else { + } else if (item.orderType === '2') { window.open(location.origin + `/#/order-management/bulk/bulk-detail/${item.orderId}`); + } else if (item.orderType === '3'){ + this.router.navigate(['/order-management/vehicle/vehicle-detail/' + item.orderId]); } } @@ -477,9 +479,11 @@ export class DatatableFundReportingComponent implements OnInit { if (item.orderType === '1') { window.open(location.origin + `/#/waybill-management/vehicle/vehicle-detail/${item.wayBillId}`); - } else { + } else if (item.orderType === '2') { window.open(location.origin + `/#/waybill-management/bulk/bulk-detail/${item.wayBillId}`); + } else if (item.orderType === '3') { + window.open(location.origin + `/#/waybill-management/vehicle/vehicle-detail/${item.wayBillId}`); } } diff --git a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts index 9e87d018..a01eefb1 100644 --- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts +++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts @@ -599,8 +599,10 @@ export class DatatableOrderReportingComponent implements OnInit { routeToOrder(item: any) { if (item.billType === '1') { window.open(location.origin + `/#/order-management/vehicle/vehicle-detail/${item.orderId}`); - } else { + } else if (item.billType === '2') { window.open(location.origin + `/#/order-management/bulk/bulk-detail/${item.orderId}`); + } else if (item.billType === '3') { + window.open(location.origin + `/#/order-management/vehicle/vehicle-detail/${item.orderId}`); } } @@ -608,8 +610,10 @@ export class DatatableOrderReportingComponent implements OnInit { if (item.billType === '1') { window.open(location.origin + `/#/waybill-management/vehicle/vehicle-detail/${item.waybillId}`); - } else { + } else if (item.billType === '2') { window.open(location.origin + `/#/waybill-management/bulk/bulk-detail/${item.waybillId}`); + } else if (item.billType === '3') { + window.open(location.origin + `/#/waybill-management/vehicle/vehicle-detail/${item.waybillId}`); } } diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts index bbcb46cf..b247d051 100644 --- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts +++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts @@ -236,7 +236,7 @@ export class WithdrawalsDetailComponent implements OnInit { width: 140 }, { title: '运费明细', render: 'amountDetails', className: 'text-right', width: 150 }, - { title: '货主', index: 'ltdName', className: 'text-left', width: 200 }, + { title: '货主', index: 'enterpriseInfoName', className: 'text-left', width: 200 }, { title: '订单号', render: 'billId', width: 200 }, { title: '运单号', render: 'wayBillId', width: 200 }, { title: '货源编号', index: 'resourceCode', width: 200 }, diff --git a/src/app/routes/partner/partner-list/components/index/partner-list.component.ts b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts index 31081842..0bc0d204 100644 --- a/src/app/routes/partner/partner-list/components/index/partner-list.component.ts +++ b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts @@ -281,10 +281,13 @@ export class PartnerListComponent { approvalStatus: { type: 'string', title: '认证审核状态', + enum: [ + { value: '', label: '全部' }, + { value: 1, label: '企业' }, + { value: 2, label: '个人' } + ], ui: { - widget: 'dict-select', - containsAllLabel: true, - params: { dictKey: 'pay:mode' }, + widget: 'select', placeholder: '请选择', visibleIf: { expand: (value: boolean) => value @@ -350,7 +353,7 @@ export class PartnerListComponent { title: '合伙人状态', enum: [ { value: '', label: '全部' }, - { value: 0, label: '启用' }, + { value: 0, label: '正常' }, { value: 1, label: '冻结' } ], ui: { diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html index a72764af..bff494dd 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-02-24 20:09:49 * @LastEditors : Shiming - * @LastEditTime : 2022-04-27 15:03:23 + * @LastEditTime : 2022-05-05 17:04:31 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -74,13 +74,14 @@ - + + 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 adabb773..1ed294e6 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 @@ -124,17 +124,20 @@ export class AnnouncementMessageComponent implements OnInit { initSFFre() { this.addSchema = { properties: { - appIdList: { + receiverType: { type: 'string', title: '发布平台', enum: [ - { label: '运营后台', value: this.envSrv.env.appId }, + // { 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 }, ], ui: { widget: 'select', - mode: 'multiple', errors: { required: '请选择' }, placeholder: '请选择' } @@ -229,7 +232,7 @@ this.ui2 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } }; const params ={ ...this.sfFre.value } - if(this.editId) { + if(this.edit) { params.id = this.editId console.log(params) this.service.request(this.service.$api_modifyAnnouncementInfo, params).subscribe((res:any) => { diff --git a/src/app/routes/usercenter/components/driver/detail/detail.component.html b/src/app/routes/usercenter/components/driver/detail/detail.component.html index 1ff14602..46f78375 100644 --- a/src/app/routes/usercenter/components/driver/detail/detail.component.html +++ b/src/app/routes/usercenter/components/driver/detail/detail.component.html @@ -16,8 +16,8 @@

-
@@ -350,7 +356,8 @@ {{ licenseDetail?.licenseNo }} - + 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 707f5bc4..5f0d740a 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 @@ -1,14 +1,4 @@ - - +
@@ -25,8 +14,8 @@ [class.expend-options]="_$expand"> - +
- + --> - + +
+ + + + +
+ + +
+ + +
+ + [req]="{ process: beforeReq }" [page]=" {}" [loading]="false" [scroll]="{ x: '1200px',y:scrollY }"> diff --git a/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.less b/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.less deleted file mode 100644 index 52b6737d..00000000 --- a/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.less +++ /dev/null @@ -1,32 +0,0 @@ -:host { - ::ng-deep { - .tabs-wrap>.ant-tabs-nav { - margin-bottom: 0; - } - - .myForm .ant-upload.ant-upload-select-picture-card>.ant-upload { - flex-direction: column !important; - } - - span { - word-break: break-all - } - - } -} - -.expend-options { - margin-top: 0px; -} - - -@media (min-width: 990px) { - .expend-options { - margin-top: -40px; - max-width : 400px; - position : absolute; - right : 0; - bottom : 30px; - } - -} \ No newline at end of file diff --git a/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts b/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts index a2f34c9c..5a8d983d 100644 --- a/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts +++ b/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts @@ -2,23 +2,22 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { STChange, STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st'; import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form'; +import { SearchDrawerService } from '@shared'; import { NzModalService } from 'ng-zorro-antd/modal'; +import { BasicTableComponent } from 'src/app/routes/commom'; import { UsermanageService } from '../../../services/usercenter.service'; import { AuditAdminComponent } from './audit-admin/audit-admin.component'; @Component({ selector: 'app-Freight-components-enterprise-audit', templateUrl: './enterprise-audit.component.html', - styleUrls: ['./enterprise-audit.component.less'] + styleUrls: ['../../../../commom/less/commom-table.less'] }) -export class FreightComponentsEnterpriseAuditComponent implements OnInit { - _$expand = false; - ui: SFUISchema = { '*': { spanLabelFixed: 90, grid: { lg: 8, md: 12, sm: 12, xs: 24 } } }; - schema: SFSchema = this.initSF(); +export class FreightComponentsEnterpriseAuditComponent extends BasicTableComponent implements OnInit { enterColumns: STColumn[] = this.initEnterST(); adminColumns: STColumn[] = this.initAdminST(); + schema = this.initSF(); @ViewChild('st', { static: false }) st!: STComponent; - @ViewChild('sf', { static: false }) sf!: SFComponent; tabType = 1; tabs = [ { @@ -45,7 +44,18 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit { networkTransporter = null; roleId = null; customerServiceId = null; - constructor(public service: UsermanageService, private router: Router, private modal: NzModalService) {} + constructor( + public service: UsermanageService, + private router: Router, + private modal: NzModalService, + public searchDrawerService: SearchDrawerService + ) { + super(searchDrawerService); + } + + search() { + this.st?.load(1); + } beforeReq = (requestOptions: STRequestOptions) => { if (this.sf) { @@ -65,21 +75,6 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit { return requestOptions; }; - /** - * 伸缩查询条件 - */ - expandToggle(status: boolean) { - this._$expand = status; - this.sf?.setValue('/expand', this._$expand); - } - - /** - * 重置表单 - */ - resetSF() { - this.sf.reset(); - this._$expand = false; - } /** * 程序初始化入口 */ @@ -221,7 +216,6 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit { // 切换Tab changeTab(item: any) { this.tabType = item.type; - this.expandToggle(false); this.sf?.reset(); this.st.data = this.tabType === 1 ? this.service.$api_get_freight_list : this.service.$api_get_enterprise_admin_list; setTimeout(() => { @@ -240,7 +234,7 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit { } exportList() { - const params = { ...this.sf?.value, flag: this.tabType, listSource: 2, pageSize: -1 }; + const params = { ...this.sf?.value, flag: this.tabType, listSource: 2, pageSize: -1 }; this.service.downloadFile(this.service.$api_export_enterprise, params); } @@ -403,10 +397,7 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit { ], default: '', ui: { - widget: 'select', - visibleIf: { - expand: (value: boolean) => this.tabType === 1 - } + widget: 'select' } }, enterpriseAddressCode: { @@ -415,10 +406,7 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit { enum: [{ label: '全部', value: '' }], default: '', ui: { - widget: 'select', - visibleIf: { - expand: (value: boolean) => this.tabType === 1 && value - } + widget: 'select' } }, oftenUsedServices: { @@ -431,10 +419,7 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit { ], default: '', ui: { - widget: 'select', - visibleIf: { - expand: (value: boolean) => this.tabType === 1 && value - } + widget: 'select' } }, // approval11St11atus: { @@ -454,10 +439,7 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit { type: 'string', ui: { placeholder: '请输入', - showRequired: false, - visibleIf: { - expand: (value: boolean) => this.tabType === 1 && value - } + showRequired: false } }, mobile: { @@ -465,10 +447,7 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit { type: 'string', maxLength: 11, ui: { - placeholder: '请输入', - visibleIf: { - expand: (value: boolean) => this.tabType === 2 - } + placeholder: '请输入' } }, approvalUserName: { @@ -476,10 +455,7 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit { type: 'string', maxLength: 11, ui: { - placeholder: '请输入', - visibleIf: { - expand: (value: boolean) => this.tabType === 1 && value - } + placeholder: '请输入' } }, createTime: { @@ -488,10 +464,7 @@ export class FreightComponentsEnterpriseAuditComponent 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: { @@ -500,10 +473,7 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit { ui: { widget: 'sl-from-to-search', format: 'yyyy-MM-dd HH:mm:ss', - nzShowTime: true, - visibleIf: { - expand: (value: boolean) => this.tabType === 1 && value - } + nzShowTime: true } as SFDateWidgetSchema }, approvalStatus: { @@ -518,10 +488,7 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit { ], default: '', ui: { - widget: 'select', - visibleIf: { - expand: (value: boolean) => value - } + widget: 'select' } }, source: { @@ -534,10 +501,7 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit { ], default: '', ui: { - widget: 'select', - visibleIf: { - expand: (value: boolean) => this.tabType === 1 && value - } + widget: 'select' } } } diff --git a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html index 5b95b4a7..4449618b 100644 --- a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html +++ b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html @@ -340,8 +340,13 @@ 企业开票信息 - + + + + + {{detailData.createBank}} + - + + + + + {{detailData.registerAddress}} + diff --git a/src/app/routes/usercenter/components/freight/list/list.component.less b/src/app/routes/usercenter/components/freight/list/list.component.less deleted file mode 100644 index 07d74cbd..00000000 --- a/src/app/routes/usercenter/components/freight/list/list.component.less +++ /dev/null @@ -1,19 +0,0 @@ -:host{ - ::ng-deep{ - .btnBox { - st-td{ - // display: flex; - // align-items: center; - st-td>span{ - display: inline-block; - width: 95px; - text-align: center; - margin: 0 10px; - } - } - .st__btn-text span{ - white-space: nowrap; - } - } - } -} 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 aebe3d5a..77115d8f 100644 --- a/src/app/routes/usercenter/components/freight/user/user.component.html +++ b/src/app/routes/usercenter/components/freight/user/user.component.html @@ -1,16 +1,5 @@ - - - + -
@@ -26,20 +15,30 @@
- + --> - - - - - - - + +
+ + + + + + + +
+ + +
+ + +
+ - - + [scroll]="{ x:'1200px',y:scrollY }" [page]="{ }" [loading]="service.http.loading">
this.st.load() } }; +export class FreightComponentsUserComponent extends BasicTableComponent implements OnInit { schema: SFSchema = this.initSF(); columns: STColumn[] = this.initST(); @ViewChild('st', { static: false }) st!: STComponent; - @ViewChild('sf', { static: false }) sf!: SFComponent; @ViewChild('promoterModal', { static: false }) promoterModal!: any; @@ -23,7 +22,16 @@ export class FreightComponentsUserComponent implements OnInit { resourceStatus: any = 0; - constructor(public service: UsermanageService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute) {} + constructor(public service: UsermanageService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute, + public searchDrawerService: SearchDrawerService + ) { + super(searchDrawerService); + } + + search() { + this.st?.load(1); + } + ngOnInit() { this.ar.url.subscribe(params => { @@ -106,19 +114,6 @@ export class FreightComponentsUserComponent implements OnInit { }); } - expandToggle() { - this._$expand = !this._$expand; - this.sf?.setValue('/expand', this._$expand); - } - - /** - * 重置表单 - */ - resetSF() { - this.sf.reset(); - this._$expand = false; - } - private initSF(): SFSchema { return { properties: { @@ -163,9 +158,6 @@ export class FreightComponentsUserComponent implements OnInit { default: '', ui: { widget: 'select', - visibleIf: { - expand: (value: boolean) => value - } } }, promotersTelephone: { @@ -174,9 +166,6 @@ export class FreightComponentsUserComponent implements OnInit { maxLength: 11, ui: { placeholder: '请输入手机号', - visibleIf: { - expand: (value: boolean) => value - } } }, effectiveDate: { @@ -186,9 +175,6 @@ export class FreightComponentsUserComponent implements OnInit { widget: 'date', mode: 'range', format: 'yyyy-MM-dd', - visibleIf: { - expand: (value: boolean) => value - } } as SFDateWidgetSchema } } 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 d1d93b68..d4af99da 100644 --- a/src/app/routes/vehicle/components/audit/detail/detail.component.html +++ b/src/app/routes/vehicle/components/audit/detail/detail.component.html @@ -83,12 +83,12 @@ - + - @@ -154,6 +154,16 @@ 行驶证信息
+ + + @@ -197,6 +207,16 @@ + + + + @@ -224,7 +244,15 @@
- 道路运输证信息 +

+ 道路运输证信息 + + +

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 05b2c479..187882d1 100644 --- a/src/app/routes/vehicle/components/list/detail/detail.component.html +++ b/src/app/routes/vehicle/components/list/detail/detail.component.html @@ -11,7 +11,8 @@
- + @@ -25,91 +26,59 @@ 车辆基础信息
- -
-
已入网
-
未入网
+ +
+
+ 已入网
+
未入网 +
+
-
- + - + - + - + - + - + - + @@ -118,12 +87,10 @@ - + "> @@ -133,70 +100,45 @@ 行驶证信息 - + - + + + + + {{detailData?.carBrand }} + - + - + - + - + + + + + {{detailData?.driverLicenseSigningOrg }} + @@ -204,33 +146,17 @@ - + - + - + @@ -239,72 +165,44 @@ - + - + - - + + - + - + + + + + {{detailData?.carOwner }} + + <<<<<<< HEAD=======>>>>>>> 6d503f57e2434e5c0a0baa406ac42fe2b7a8a9b5 - + "> - + "> @@ -313,66 +211,42 @@

道路运输证信息 -

- + - + - + - + - + "> @@ -380,19 +254,10 @@ 认证司机 - +
未上传 @@ -407,13 +272,8 @@ - + @@ -434,27 +294,15 @@ - +
上传
 -
+
@@ -465,4 +313,4 @@
- + \ No newline at end of file diff --git a/src/app/shared/components/account-detail/account-detail.component.html b/src/app/shared/components/account-detail/account-detail.component.html index 86ce37aa..a23b587f 100644 --- a/src/app/shared/components/account-detail/account-detail.component.html +++ b/src/app/shared/components/account-detail/account-detail.component.html @@ -1,22 +1,12 @@ - + [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="false" + [scroll]="{ y: '370px' }"> - {{ item.paAccount || '添加' }} + {{ item.paAccount || '添加' }} - {{ item.pfAccount || '添加' }} + {{ item.pfAccount || '添加' }} \ No newline at end of file diff --git a/src/app/shared/components/account-detail/account-detail.component.ts b/src/app/shared/components/account-detail/account-detail.component.ts index a0b1a133..c1585743 100644 --- a/src/app/shared/components/account-detail/account-detail.component.ts +++ b/src/app/shared/components/account-detail/account-detail.component.ts @@ -1,6 +1,7 @@ import { CurrencyPipe } from '@angular/common'; import { Component, OnInit, ViewChild } from '@angular/core'; import { STComponent, STColumn, STRequestOptions } from '@delon/abc/st'; +import { ACLService } from '@delon/acl'; import { NzModalRef } from 'ng-zorro-antd/modal'; import { BaseService } from '../../services'; @@ -18,7 +19,9 @@ export class AccountDetailComponent implements OnInit { isCanCreate = false; params: any = {}; - constructor(public service: BaseService, public currencyPipe: CurrencyPipe, private modalHelp: NzModalRef) { + constructor(public service: BaseService, public currencyPipe: CurrencyPipe, private modalHelp: NzModalRef, private acl: ACLService) { + const acls = acl.data.abilities || []; + this.isCanCreate = acl.data.full || !!acls.find(acl => acl === 'USERCENTER-FREIGHT-LIST-createAccount'); this.initST(); }