From a022aca5b171dab698f5241748dced091a9c79fc Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Wed, 27 Apr 2022 15:57:23 +0800 Subject: [PATCH 01/12] 7310 --- proxy.conf.js | 2 +- .../etc-invoiced-requested.component.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index 0cbdec59..2799a9fa 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -30,7 +30,7 @@ module.exports = { // }, '//api': { target: { - host: 'tms-api-dev.eascs.com', + host: 'tms-api-test.eascs.com', protocol: 'https:', port: 443 }, diff --git a/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.html b/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.html index 24197616..ec761076 100644 --- a/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.html +++ b/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.html @@ -44,7 +44,7 @@ - {{item.driverName}}
{{item.driverTelephone}} + {{item.driverName}}
{{item.driverPhone}} {{item.licenseCarNo}}
{{item.licenseBelonging}} From 9cba8ef2d5a71b325c1be7094041495f11febc61 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 27 Apr 2022 15:58:29 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order-management/components/bulk/bulk.component.ts | 3 +-- .../components/rebate-setting/rebate-setting.component.ts | 8 ++++---- src/app/routes/sys-setting/sys-setting.module.ts | 4 +--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/app/routes/order-management/components/bulk/bulk.component.ts b/src/app/routes/order-management/components/bulk/bulk.component.ts index f027a4e3..3c16edf1 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -8,10 +8,9 @@ import { OrderManagementService } from '../../services/order-management.service' import { UpdateFreightComponent } from '../../modal/bulk/update-freight/update-freight.component'; import { ConfirReceiptComponent } from '../../modal/bulk/confir-receipt/confir-receipt.component'; import { of, Subscription } from 'rxjs'; -import { ShipperBaseService } from '@shared'; +import { SearchDrawerService, ShipperBaseService } from '@shared'; import { Router, ActivatedRoute } from '@angular/router'; import { OneCarOrderCancelConfirmComponent } from '../../modal/vehicle/cancel-confirm/cancel-confirm.component'; -import { SearchDrawerService } from 'src/app/shared/components/search-drawer/search-drawer.service'; import { BasicTableComponent } from 'src/app/routes/commom/components/basic-table/basic-table.component'; @Component({ diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts index 08265976..f04106cb 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts @@ -49,15 +49,15 @@ export class ParterRebateManageMentSettingComponent implements OnInit { properties: { configName: { type: 'string', - title: '配置名称', + title: '模板名称', }, stateLocked: { type: 'string', title: '状态', enum: [ {label: '全部', value: ''}, - {label: '启用', value: 0}, - {label: '禁用', value: 1}, + {label: '生效中', value: 1}, + {label: '失效', value: 0}, ], ui: { widget: 'select', @@ -129,7 +129,7 @@ export class ParterRebateManageMentSettingComponent implements OnInit { }, { text: '禁用', - iif: (_record) =>{ return _record.stateLocked == true}, + iif: (_record) =>{ return _record.stateLocked == true && (_record.partnerType == 3 || _record.partnerType == 2)}, click: _record => this.viewEvaluate(_record), }, { diff --git a/src/app/routes/sys-setting/sys-setting.module.ts b/src/app/routes/sys-setting/sys-setting.module.ts index 790c36bd..b7aca3fd 100644 --- a/src/app/routes/sys-setting/sys-setting.module.ts +++ b/src/app/routes/sys-setting/sys-setting.module.ts @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-12-03 15:23:05 - * @LastEditTime : 2022-04-27 11:28:48 + * @LastEditTime : 2022-04-27 15:52:30 * @LastEditors : Shiming * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @FilePath : \\tms-obc-web\\src\\app\\routes\\sys-setting\\sys-setting.module.ts @@ -38,7 +38,6 @@ import { OrganizationManagementComponent } from './components/organization-manag import { OrganizationModalComponent } from './components/organization-management/organization-modal/organization-modal.component'; import { ApiAuthModalComponent } from './components/organization-management/api-auth-modal/api-auth-modal.component'; import { MenuTreeComponent } from './components/organization-management/menu-tree/menu-tree.component'; -import { PartnerSystemConfigComponent } from './components/config/config.component'; const COMPONENTS = [ StaffManagementComponent, @@ -59,7 +58,6 @@ const COMPONENTS = [ NoTeManagementComponent, SmsTemplateComponent, OrganizationManagementComponent, - PartnerSystemConfigComponent ]; const NOTROUTECOMPONENTS = [ BuyerTranspowerComponent, From dc42627c8101ac6ac068ac721f10ef14220892c2 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Wed, 27 Apr 2022 16:15:23 +0800 Subject: [PATCH 03/12] 7310 --- .../financetable/financetable.component.html | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/app/routes/datatable/components/financetable/financetable.component.html b/src/app/routes/datatable/components/financetable/financetable.component.html index 4d0c7d04..c1c33102 100644 --- a/src/app/routes/datatable/components/financetable/financetable.component.html +++ b/src/app/routes/datatable/components/financetable/financetable.component.html @@ -10,20 +10,22 @@ --> - +
- +
- - + +
@@ -31,9 +33,7 @@ + [req]="{ params: reqParams }" [scroll]="{ x: '1200px' }" [page]="{ }" [loading]="service.http.loading"> {{item.czcgje | currency}} @@ -66,26 +66,27 @@ - +
- +
- +
- +
- +
From 9d544aa62e963470ac73c4ed0a0096ba283ac516 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 27 Apr 2022 16:25:12 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../level-config/components/list/list.component.ts | 4 ++-- .../vehicle/components/list/carauth/carauth.component.ts | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/app/routes/partner/level-config/components/list/list.component.ts b/src/app/routes/partner/level-config/components/list/list.component.ts index fa27d518..442efa56 100644 --- a/src/app/routes/partner/level-config/components/list/list.component.ts +++ b/src/app/routes/partner/level-config/components/list/list.component.ts @@ -110,12 +110,12 @@ export class ParterLevelConfigListComponent implements OnInit { { text: '禁用', click: (_record, _modal, _instance) => this.stop(_record), - iif: item => !item.stateLocked + iif: item => item.stateLocked }, { text: '启用', click: (_record, _modal, _instance) => this.restart(_record), - iif: item => item.stateLocked + iif: item => !item.stateLocked } ] } diff --git a/src/app/routes/vehicle/components/list/carauth/carauth.component.ts b/src/app/routes/vehicle/components/list/carauth/carauth.component.ts index d72f78f0..8354fd66 100644 --- a/src/app/routes/vehicle/components/list/carauth/carauth.component.ts +++ b/src/app/routes/vehicle/components/list/carauth/carauth.component.ts @@ -181,6 +181,14 @@ export class CarSettleCarauthComponent implements OnInit { placeholder:'请上传行驶证自动带出' }, }, + carEnergyType: { + title: '车辆能源类型', + type: 'string', + readOnly: true, + ui: { + placeholder:'请输入车辆能源类型' + }, + }, carLength: { title: '车长', type: 'string', From 88ea143bada30cd16c96d5c9b1069be8024d6386 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Wed, 27 Apr 2022 16:35:11 +0800 Subject: [PATCH 05/12] 7310 --- .../menu-tree/menu-tree.component.ts | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/app/routes/sys-setting/components/organization-management/menu-tree/menu-tree.component.ts b/src/app/routes/sys-setting/components/organization-management/menu-tree/menu-tree.component.ts index a01cade2..1db86b54 100644 --- a/src/app/routes/sys-setting/components/organization-management/menu-tree/menu-tree.component.ts +++ b/src/app/routes/sys-setting/components/organization-management/menu-tree/menu-tree.component.ts @@ -158,6 +158,7 @@ export class MenuTreeComponent implements OnInit, OnChanges { auths.push(origin.id); const authsSet = new Set(auths); this.authorityAssistId = [...Array.from(authsSet)]; + this.recursionAddParantNode(node); } else { data.forEach(auth => this._apiAuthSet.delete(auth.functionButtonId)); this._NodeAuthMap.delete(origin.id); @@ -243,9 +244,29 @@ export class MenuTreeComponent implements OnInit, OnChanges { private recursionDeleteParantNode(node: NzTreeNode) { this.authorityAssistId = this.authorityAssistId.filter(auth => auth !== node.origin.id); if (node.parentNode) { + if (!node.parentNode.children.find(node => node.isChecked) && node.parentNode.origin.level !== 0) { + this._NodeAuthMap.delete(node.parentNode.origin.id); + } this.recursionDeleteParantNode(node.parentNode); } } + + /** + * 向上递归添加父节点到源数据 + * 清理勾选数据 + * + * @param node + */ + private recursionAddParantNode(node: NzTreeNode) { + this._NodeAuthMap.set(node.origin.id, { + authorityId: node.origin.id, + buttonAuthorityIds: [], + isUpdateAuthority: 1 + }); + if (node.parentNode) { + this.recursionAddParantNode(node.parentNode); + } + } } export interface AuthorityIdVO { From 9fa1a206efa47ef7f775029f35ab5d3096d07946 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 27 Apr 2022 16:40:38 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order-management/components/risk/risk.component.ts | 2 ++ .../components/list/carauth/carauth.component.ts | 10 +++------- 2 files changed, 5 insertions(+), 7 deletions(-) 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 118f1e60..3e15ac53 100644 --- a/src/app/routes/order-management/components/risk/risk.component.ts +++ b/src/app/routes/order-management/components/risk/risk.component.ts @@ -65,6 +65,8 @@ export class OrderManagementRiskComponent extends BasicTableComponent implements beforeReq = (requestOptions: STRequestOptions) => { const a: any = {}; if (this.resourceStatus) { + console.log(this.resourceStatus); + a.representationsStatus = this.resourceStatus; } const params: any = Object.assign({}, this.sf?.value || {}); diff --git a/src/app/routes/vehicle/components/list/carauth/carauth.component.ts b/src/app/routes/vehicle/components/list/carauth/carauth.component.ts index 8354fd66..6494a9c4 100644 --- a/src/app/routes/vehicle/components/list/carauth/carauth.component.ts +++ b/src/app/routes/vehicle/components/list/carauth/carauth.component.ts @@ -469,13 +469,8 @@ export class CarSettleCarauthComponent implements OnInit { title: '使用性质', type: 'string', maxLength: 30, - enum: [ - { label: '非营运', value: 0 }, - { label: '营运', value: 1 }, - ], ui: { - widget: 'select', - placeholder: '请选择', + placeholder: '请输入', }, }, curbWeight: { @@ -602,6 +597,7 @@ export class CarSettleCarauthComponent implements OnInit { 'carNo', 'carNoColor', 'carModel', + 'carEnergyType', 'carLength', 'carLoad', 'isSelf', @@ -689,7 +685,7 @@ export class CarSettleCarauthComponent implements OnInit { this.sf.setValue('/driverLicenseSigningOrg', res.issuingAuthority); this.sf.setValue('/carDistinguishCode', res.vin); this.sf.setValue('/carOwner', res.name); - this.sf.setValue('/useNature', res.useCharacter === '非营运' ? 0 : 1); + this.sf.setValue('/useNature', res.useCharacter); this.sf.setValue('/carModel', res?.vehicleType); } else { From eb015bf42ea05665bc7aa74c3a55c3a0249ac253 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 27 Apr 2022 16:57:30 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic-table/basic-table.component.ts | 6 +- .../components/bulk/bulk.component.ts | 2 + .../receipts-audit.component.ts | 60 ++++++------------- .../components/risk/risk.component.ts | 16 ++--- 4 files changed, 31 insertions(+), 53 deletions(-) diff --git a/src/app/routes/commom/components/basic-table/basic-table.component.ts b/src/app/routes/commom/components/basic-table/basic-table.component.ts index ab7c5e86..dfe8a25d 100644 --- a/src/app/routes/commom/components/basic-table/basic-table.component.ts +++ b/src/app/routes/commom/components/basic-table/basic-table.component.ts @@ -1,8 +1,8 @@ import { AfterViewInit, Component, OnDestroy, OnInit } from '@angular/core'; import { SFComponent, SFSchema } from '@delon/form'; +import { SearchDrawerService } from '@shared'; import { fromEvent, Subscription } from 'rxjs'; import { debounceTime } from 'rxjs/operators'; -import { SearchDrawerService } from 'src/app/shared/components/search-drawer/search-drawer.service'; @Component({ template: '' @@ -40,14 +40,14 @@ export class BasicTableComponent implements AfterViewInit, OnDestroy { } else { const drawer = this.searchDrawerService.create(this.sfValue, this.schema); this.drawer.push( - drawer.initEvent.subscribe(sf => { + drawer.initEvent.subscribe((sf: SFComponent) => { if (sf) { this.sf = sf; } }) ); this.drawer.push( - drawer.closeEvent.subscribe(res => { + drawer.closeEvent.subscribe((res: Record) => { this.sfValue = res; if (res) { this.search(); diff --git a/src/app/routes/order-management/components/bulk/bulk.component.ts b/src/app/routes/order-management/components/bulk/bulk.component.ts index 3c16edf1..5db9b5ff 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -103,6 +103,8 @@ export class OrderManagementBulkComponent extends BasicTableComponent implements } }); } + console.log(requestOptions); + this.loading = true; return requestOptions; }; diff --git a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts index 31987466..57c825d0 100644 --- a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts +++ b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts @@ -53,14 +53,14 @@ export class OrderManagementReceiptsAuditComponent extends BasicTableComponent i if (this.resourceStatus) { a.auditStatus = this.resourceStatus; } - const params: any = Object.assign({}, this.sf?.value || {}); + const params: any = Object.assign({}, this.sfValue || {}); delete params._$expand; return { ...a, ...params, createTime: { - start: this.sf?.value?.createTime?.[0] || '', - end: this.sf?.value?.createTime?.[1] || '' + start: this.sfValue?.createTime?.[0] || '', + end: this.sfValue?.createTime?.[1] || '' } }; } @@ -69,15 +69,15 @@ export class OrderManagementReceiptsAuditComponent extends BasicTableComponent i if (this.resourceStatus) { a.auditStatus = this.resourceStatus; } - const params: any = Object.assign({}, this.sf?.value || {}); + const params: any = Object.assign({}, this.sfValue || {}); delete params._$expand; - if (this.sf) { + if (this.sfValue) { Object.assign(requestOptions.body, { ...a, ...params, createTime: { - start: this.sf?.value?.createTime?.[0] || '', - end: this.sf?.value?.createTime?.[1] || '' + start: this.sfValue?.createTime?.[0] || '', + end: this.sfValue?.createTime?.[1] || '' } }); } @@ -170,9 +170,6 @@ export class OrderManagementReceiptsAuditComponent extends BasicTableComponent i searchDebounceTime: 300, searchLoadingText: '搜索中...', allowClear: true, - visibleIf: { - _$expand: (value: boolean) => value - }, onSearch: (q: any) => { let str = q.replace(/^\s+|\s+$/g, ''); if (str) { @@ -195,54 +192,42 @@ export class OrderManagementReceiptsAuditComponent extends BasicTableComponent i ui: { widget: 'select', placeholder: '请先选择货主', - visibleIf: { - _$expand: (value: boolean) => value - } + } as SFSelectWidgetSchema }, loadingPlace: { type: 'string', title: '装货地', ui: { - visibleIf: { - _$expand: (value: boolean) => value - } + } }, dischargePlace: { type: 'string', title: '卸货地', ui: { - visibleIf: { - _$expand: (value: boolean) => value - } + } }, driverName: { title: '承运司机', type: 'string', ui: { - visibleIf: { - _$expand: (value: boolean) => value - } + } }, carNo: { title: '车牌号', type: 'string', ui: { - visibleIf: { - _$expand: (value: boolean) => value - } + } }, carCaptainName: { title: '车队长', type: 'string', ui: { - visibleIf: { - _$expand: (value: boolean) => value - } + } }, paymentStatus: { @@ -252,9 +237,7 @@ export class OrderManagementReceiptsAuditComponent extends BasicTableComponent i widget: 'dict-select', params: { dictKey: 'overall:payment:status' }, containsAllLabel: true, - visibleIf: { - _$expand: (value: boolean) => value - } + } as SFSelectWidgetSchema }, enterpriseInfoId: { @@ -264,9 +247,6 @@ export class OrderManagementReceiptsAuditComponent extends BasicTableComponent i widget: 'select', placeholder: '请选择', allowClear: true, - visibleIf: { - _$expand: (value: boolean) => value - }, asyncData: () => this.shipperservice.getNetworkFreightForwarder() } }, @@ -278,9 +258,7 @@ export class OrderManagementReceiptsAuditComponent extends BasicTableComponent i widget: 'dict-select', params: { dictKey: 'service:type' }, containsAllLabel: true, - visibleIf: { - _$expand: (value: boolean) => value - } + } as SFSelectWidgetSchema }, billStatus: { @@ -291,9 +269,7 @@ export class OrderManagementReceiptsAuditComponent extends BasicTableComponent i widget: 'dict-select', params: { dictKey: 'bill:status' }, containsAllLabel: true, - visibleIf: { - _$expand: (value: boolean) => value - } + } as SFSelectWidgetSchema }, loadingDocuments: { @@ -310,9 +286,7 @@ export class OrderManagementReceiptsAuditComponent extends BasicTableComponent i widget: 'select', placeholder: '请选择', allowClear: true, - visibleIf: { - _$expand: (value: boolean) => value - } + } } }, 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 3e15ac53..c47cb875 100644 --- a/src/app/routes/order-management/components/risk/risk.component.ts +++ b/src/app/routes/order-management/components/risk/risk.component.ts @@ -51,14 +51,14 @@ export class OrderManagementRiskComponent extends BasicTableComponent implements if (this.resourceStatus) { a.representationsStatus = this.resourceStatus; } - const params: any = Object.assign({}, this.sf?.value || {}); + const params: any = Object.assign({}, this.sfValue || {}); delete params._$expand; return { ...a, ...params, createTime: { - start: this.sf?.value?.createTime?.[0] || '', - end: this.sf?.value?.createTime?.[1] || '' + start: this.sfValue?.createTime?.[0] || '', + end: this.sfValue?.createTime?.[1] || '' } }; } @@ -69,18 +69,20 @@ export class OrderManagementRiskComponent extends BasicTableComponent implements a.representationsStatus = this.resourceStatus; } - const params: any = Object.assign({}, this.sf?.value || {}); + const params: any = Object.assign({}, this.sfValue || {}); delete params._$expand; - if (this.sf) { + if (this.sfValue) { Object.assign(requestOptions.body, { ...a, ...params, createTime: { - start: this.sf?.value?.createTime?.[0] || '', - end: this.sf?.value?.createTime?.[1] || '' + start: this.sfValue?.createTime?.[0] || '', + end: this.sfValue?.createTime?.[1] || '' } }); } + console.log(requestOptions); + this.loading = true; return requestOptions; }; From 5e66a30318cbc93177391fe10cf3c076b271e067 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 27 Apr 2022 17:00:02 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/risk-detail/risk-detail.component.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 index d982d8f4..1090a578 100644 --- 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 @@ -79,7 +79,7 @@ export class OrderManagementRiskDetailComponent implements OnInit { '*': { spanLabelFixed: 180, grid: { span: 18 }, - width: 600, + width: 900, }, $title1: { spanLabelFixed: 0, @@ -94,6 +94,10 @@ export class OrderManagementRiskDetailComponent implements OnInit { spanLabelFixed: 20, grid: { span: 3 }, }, + $uploadVanchor: { + spanLabelFixed: 180, + grid: { span: 24 }, + }, }; } /** From c829cd3e591d11d9e793b29e8d65f8c301d82f6b Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Wed, 27 Apr 2022 17:07:11 +0800 Subject: [PATCH 09/12] edit --- .../customindex/customindex.component.html | 66 +++++++------------ .../operationtable.component.html | 27 ++++---- .../waybill-management-routing.module.ts | 30 +++++++-- 3 files changed, 62 insertions(+), 61 deletions(-) diff --git a/src/app/routes/datatable/components/customtable/customindex/customindex.component.html b/src/app/routes/datatable/components/customtable/customindex/customindex.component.html index b41b90b2..e94c3229 100644 --- a/src/app/routes/datatable/components/customtable/customindex/customindex.component.html +++ b/src/app/routes/datatable/components/customtable/customindex/customindex.component.html @@ -12,88 +12,70 @@
- +
- +
- +
- +
- +
- +
- - + +
- - + [page]="{ show: false, showSize: false, pageSizes: [20, 50, 100] }"> +
货主
合伙人
司机
车辆
- - + + - +
- +
- +
- + \ No newline at end of file diff --git a/src/app/routes/datatable/components/operationtable/operationtable.component.html b/src/app/routes/datatable/components/operationtable/operationtable.component.html index 2d0201a7..b3587bb0 100644 --- a/src/app/routes/datatable/components/operationtable/operationtable.component.html +++ b/src/app/routes/datatable/components/operationtable/operationtable.component.html @@ -1,19 +1,21 @@ - +
- +
- +
- - + +
@@ -25,10 +27,10 @@ [scroll]="{ x: '1200px' }" [res]="{ reName: { list: 'data.records', total: 'data.total' } }" [page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }" [loading]="service.http.loading"> - +
- +
@@ -37,19 +39,20 @@
- +
-
+ - + \ No newline at end of file diff --git a/src/app/routes/waybill-management/waybill-management-routing.module.ts b/src/app/routes/waybill-management/waybill-management-routing.module.ts index f2b1025f..02fd8d9d 100644 --- a/src/app/routes/waybill-management/waybill-management-routing.module.ts +++ b/src/app/routes/waybill-management/waybill-management-routing.module.ts @@ -15,14 +15,30 @@ import { WaybillManagementVehicleDetailComponent } from './components/vehicle-de import { WaybillManagementVehicleComponent } from './components/vehicle/vehicle.component'; const routes: Routes = [ - { path: 'vehicle', component: WaybillManagementVehicleComponent }, - { path: 'vehicle/vehicle-detail/:id', component: WaybillManagementVehicleDetailComponent }, - { path: 'bulk', component: WaybillManagementBulkComponent }, - { path: 'bulk/bulk-detail/:id', component: WaybillManagementBulkeDetailComponent }, - { path: 'abnormal-appear', component: WaybillManagementAbnormalAppearComponent }, -] + { + path: 'vehicle', + component: WaybillManagementVehicleComponent, + data: { guard: { ability: ['WAYBILL-VEHICLE-search'] } } + }, + { + path: 'vehicle/vehicle-detail/:id', + component: WaybillManagementVehicleDetailComponent, + data: { guard: { ability: ['WAYBILL-VEHICLE-DETAIL-wholeUnloadCarInfo'] } } + }, + { path: 'bulk', component: WaybillManagementBulkComponent, data: { guard: { ability: ['WAYBILL-BULK-search'] } } }, + { + path: 'bulk/bulk-detail/:id', + component: WaybillManagementBulkeDetailComponent, + data: { guard: { ability: ['WAYBILL-BULK-DETAIL-insertBulkStartCarInfo'] } } + }, + { + path: 'abnormal-appear', + component: WaybillManagementAbnormalAppearComponent, + data: { guard: { ability: ['WAYBILL-ABNORMAL-search'] } } + } +]; @NgModule({ imports: [RouterModule.forChild(routes)], exports: [RouterModule] }) -export class WaybillManagementRoutingModule { } +export class WaybillManagementRoutingModule {} From a484a928afa99e15be16df7063ed64351ae02c6e Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 27 Apr 2022 17:13:38 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../level-config/components/list/list.component.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/app/routes/partner/level-config/components/list/list.component.ts b/src/app/routes/partner/level-config/components/list/list.component.ts index 442efa56..867d8ad5 100644 --- a/src/app/routes/partner/level-config/components/list/list.component.ts +++ b/src/app/routes/partner/level-config/components/list/list.component.ts @@ -52,8 +52,8 @@ export class ParterLevelConfigListComponent implements OnInit { title: '状态', enum: [ { label: '全部', value: '' }, - { label: '启用', value: '1' }, - { label: '禁用', value: '0' } + { label: '启用', value: '0' }, + { label: '禁用', value: '1' } ], ui: { widget: 'select' @@ -96,7 +96,7 @@ export class ParterLevelConfigListComponent implements OnInit { title: '状态', index: 'stateLocked', format: (item: any) => { - return item.stateLocked ? '启用' : '禁用'; + return item.stateLocked ? '禁用' : '启用'; } }, { @@ -110,12 +110,12 @@ export class ParterLevelConfigListComponent implements OnInit { { text: '禁用', click: (_record, _modal, _instance) => this.stop(_record), - iif: item => item.stateLocked + iif: item => !item.stateLocked }, { text: '启用', click: (_record, _modal, _instance) => this.restart(_record), - iif: item => !item.stateLocked + iif: item => item.stateLocked } ] } From 0f410f0ce1d083817192570052fd80321fb1cbdd Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 27 Apr 2022 17:14:55 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/risk-detail/risk-detail.component.ts | 1 - 1 file changed, 1 deletion(-) 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 index 1090a578..53978c43 100644 --- 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 @@ -79,7 +79,6 @@ export class OrderManagementRiskDetailComponent implements OnInit { '*': { spanLabelFixed: 180, grid: { span: 18 }, - width: 900, }, $title1: { spanLabelFixed: 0, From c4742fecb42bcec549c938dc3fd878ea6e2bb3fc Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 27 Apr 2022 17:19:57 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../receipt-order-detail.component.html | 12 +++++++++++- .../receipt-order/receipt-order.component.ts | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/app/routes/financial-management/components/receipt-order/receipt-order-detail/receipt-order-detail.component.html b/src/app/routes/financial-management/components/receipt-order/receipt-order-detail/receipt-order-detail.component.html index ab154074..ce13c2c6 100644 --- a/src/app/routes/financial-management/components/receipt-order/receipt-order-detail/receipt-order-detail.component.html +++ b/src/app/routes/financial-management/components/receipt-order/receipt-order-detail/receipt-order-detail.component.html @@ -1,3 +1,13 @@ +