From 3188d0805f38ab8b34f4998e2fa2c6a376749ae8 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 28 Apr 2022 15:00:43 +0800 Subject: [PATCH 01/15] edit --- .../financial-managemen-routing.module.ts | 4 +- .../onecar-publish.component.html | 4 +- .../supply-management-routing.module.ts | 46 ++++++++++++------- 3 files changed, 34 insertions(+), 20 deletions(-) diff --git a/src/app/routes/financial-management/financial-managemen-routing.module.ts b/src/app/routes/financial-management/financial-managemen-routing.module.ts index ba87c4ec..43fcbaca 100644 --- a/src/app/routes/financial-management/financial-managemen-routing.module.ts +++ b/src/app/routes/financial-management/financial-managemen-routing.module.ts @@ -66,8 +66,8 @@ const routes: Routes = [ { path: 'receipt-order/detail/:id', component: ReceiptOrderDetailComponent }, { path: 'advance-collection', component: AdvanceCollectionComponent }, { path: 'advance-collection/detail/:id', component: AdvanceCollectionDetailComponent }, - { path: 'receivable-order', component: ReceivableOrderComponent }, - { path: 'receivable-order/detail/:id', component: ReceivableOrderDetailComponent }, + { path: 'receivable-order', component: ReceivableOrderComponent, data: { guard: { ability: ['FINANCIAL-RECEIVABLE-list'] } } }, + { path: 'receivable-order/detail/:id', component: ReceivableOrderDetailComponent, data: { guard: { ability: ['FINANCIAL-RECEIVABLE-DETAIL-view'] } } }, { path: 'payable-order', component: PayableOrderComponent }, { path: 'payable-order/detail/:id', component: PayableOrderDetailComponent }, { path: 'bank-card-management/index', component: CwcBankCardManagementIndexComponent } diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html index 3c489ffb..73a34d9a 100644 --- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html +++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html @@ -260,9 +260,9 @@ + [acl-ability]="['SUPPLY-VEHICLE-PLACEORDER-vehicleDesignate']">指派熟车 + [acl-ability]="['SUPPLY-VEHICLE-PLACEORDER-vehicleAnotherOrder']">司机抢单 diff --git a/src/app/routes/supply-management/supply-management-routing.module.ts b/src/app/routes/supply-management/supply-management-routing.module.ts index 10425568..29f59068 100644 --- a/src/app/routes/supply-management/supply-management-routing.module.ts +++ b/src/app/routes/supply-management/supply-management-routing.module.ts @@ -51,6 +51,15 @@ const routes: Routes = [ { path: 'vehicle-amend/:id', component: SupplyManagementOnecarPublishComponent, + data: { + guard: { + ability: ['SUPPLY-VEHICLE-AMEND-submitChange'] + } + } + }, + { + path: 'vehicle-next/:id', + component: SupplyManagementOnecarPublishComponent, data: { guard: { ability: [ @@ -58,25 +67,30 @@ const routes: Routes = [ 'SUPPLY-VEHICLE-PLACEORDER-vehicleDesignate', 'SUPPLY-VEHICLE-PLACEORDER-vehicleAnotherOrder' ] - } - } + } + } }, { - path: 'vehicle-next/:id', - component: SupplyManagementOnecarPublishComponent, - // data: { - // guard: { - // ability: [ - // 'SUPPLY-VEHICLE-PLACEORDER-QRCode', - // 'SUPPLY-VEHICLE-PLACEORDER-vehicleDesignate', - // 'SUPPLY-VEHICLE-PLACEORDER-vehicleAnotherOrder' - // ] - // } - // } + path: 'vehicle-release', + component: SupplyManagementReleasePublishComponent, + data: { + guard: { ability: ['SUPPLY-VEHICLE-RELEASE-bulkDesignate', 'SUPPLY-VEHICLE-RELEASE-bulkDriverOrder'] } + } + }, + { + path: 'bulk-release', + component: SupplyManagementBulkReleasePublishComponent, + data: { + guard: { ability: ['SUPPLY-BULK-RELEASE-consignBulkAssign', 'SUPPLY-BULK-RELEASE-consignBulk'] } + } + }, + { + path: 'bulk-next/:id', + component: SupplyManagementBulkPublishComponent, + data: { + guard: { ability: ['SUPPLY-BULK-PLACEORDER-vehicleAnotherOrder', 'SUPPLY-BULK-PLACEORDER-vehicleDesignate'] } + } }, - { path: 'vehicle-release', component: SupplyManagementReleasePublishComponent }, - { path: 'bulk-release', component: SupplyManagementBulkReleasePublishComponent }, - { path: 'bulk-next/:id', component: SupplyManagementBulkPublishComponent }, { path: 'bulk-amend/:id', component: SupplyManagementBulkPublishComponent } ]; From 18378cc8a221a828084aebdfd68512e814171ca5 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 28 Apr 2022 15:05:52 +0800 Subject: [PATCH 02/15] edit --- .../financial-managemen-routing.module.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/financial-management/financial-managemen-routing.module.ts b/src/app/routes/financial-management/financial-managemen-routing.module.ts index 43fcbaca..c29dc430 100644 --- a/src/app/routes/financial-management/financial-managemen-routing.module.ts +++ b/src/app/routes/financial-management/financial-managemen-routing.module.ts @@ -68,8 +68,8 @@ const routes: Routes = [ { path: 'advance-collection/detail/:id', component: AdvanceCollectionDetailComponent }, { path: 'receivable-order', component: ReceivableOrderComponent, data: { guard: { ability: ['FINANCIAL-RECEIVABLE-list'] } } }, { path: 'receivable-order/detail/:id', component: ReceivableOrderDetailComponent, data: { guard: { ability: ['FINANCIAL-RECEIVABLE-DETAIL-view'] } } }, - { path: 'payable-order', component: PayableOrderComponent }, - { path: 'payable-order/detail/:id', component: PayableOrderDetailComponent }, + { path: 'payable-order', component: PayableOrderComponent, data: { guard: { ability: ['FINANCIAL-PAYABLE-list'] } } }, + { path: 'payable-order/detail/:id', component: PayableOrderDetailComponent, data: { guard: { ability: ['FINANCIAL-PAYABLE-DETAIL-view'] } } }, { path: 'bank-card-management/index', component: CwcBankCardManagementIndexComponent } ]; From 92ef67a236818d5c1ada9eb3aa7741376df60bba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= Date: Thu, 28 Apr 2022 15:10:54 +0800 Subject: [PATCH 03/15] =?UTF-8?q?UI=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bulk-detail/bulk-detail.component.html | 80 ++++++++++++----- .../bulk-detail/bulk-detail.component.less | 2 +- .../vehicle-detail.component.html | 88 +++++++++++-------- .../vehicle-detail.component.less | 3 +- src/styles/theme.less | 4 + 5 files changed, 113 insertions(+), 64 deletions(-) diff --git a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html index 601a0121..b1beb110 100644 --- a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html @@ -10,9 +10,9 @@

货源编码 : {{ i?.resourceCode }}

-
-
网络货运人：{{ i?.shipperAppUserName }}
-
+
+
网络货运人：{{ i?.shipperAppUserName }}
+
-
+
{{ i?.enterpriseProjectName }} @@ -41,9 +41,9 @@

货源编码 : {{ i?.resourceCode }}

-
-
网络货运人：{{ i?.shipperAppUserName }}
-
+
+
网络货运人：{{ i?.shipperAppUserName }}
+
-
+ + +
{{ i?.enterpriseProjectName }} {{ i?.deadlineTime }} {{ i?.createUserName }}/{{ i?.createUserPhone }} @@ -66,8 +66,8 @@ {{ i?.serviceTypeLabel }}
-
- +
+
-

装货卸货信息 +
+ + 装货卸货信息 ( ) -

+
+
@@ -95,7 +104,7 @@
装

装货地：{{ item?.province }}{{ item?.city }}{{ item?.area }}{{ item?.detailedAddress }}

-

联系人：{{ item?.appUserName }}/{{ item?.contractTelephone }}

+

联系人：{{ item?.appUserName }}/{{ item?.contractTelephone }}

@@ -109,7 +118,7 @@
卸

卸货地：{{ item?.province }}{{ item?.city }}{{ item?.area }}{{ item?.detailedAddress }}

-

联系人：{{ item?.appUserName }}/{{ item?.contractTelephone }}

+

联系人：{{ item?.appUserName }}/{{ item?.contractTelephone }}

@@ -140,6 +149,15 @@ {{item.carModelLabel || '--'}} / {{item.carLengthLabel || '--'}}米 + + {{i?.carrierInformationVO?.driverName || '--'}} / {{i?.carrierInformationVO?.driverTelephone || '--'}} / + {{i?.carrierInformationVO?.driverLicensePlate || '--'}} + + + {{i?.driverCarModelLabel || '--'}} / {{(i?.driverCarLength || '--') +'米'}} / {{(i?.driverCarWeight || + '--')+'吨'}} + - + +
+ + 补充信息 +
{{ i?.supplementaryInformationVO?.stateReceipt ? '是' : '否' }} @@ -213,10 +243,14 @@ - + +
+ + 操作日志 +
+ [res]="{ reName: { list: 'data.records', total: 'data.total' } }" [size]="'small'">
diff --git a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.less b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.less index df21f696..ef0733e8 100644 --- a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.less +++ b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.less @@ -48,7 +48,7 @@ } .handling-info { - min-height: 100px; + min-height: 90px; border: 1px solid #ccc; .loading-row { diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html index bcb7cb4a..32e40a15 100644 --- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html @@ -85,50 +85,24 @@
- - -
- - 基本信息 -
- - - - - {{ item.goodsTypeName }} - {{ item.goodsName }} - - {{ item.weight }}吨,{{ item.volume }}方,{{ item.number }}件 - - - - - - {{ i?.carrierInformationVO?.driverName }} - - - {{ i?.carrierInformationVO?.driverTelephone }} - - - {{ i?.carrierInformationVO?.driverLicensePlate }} - - - - {{i?.carrierInformationVO.driverName || '--'}} / {{i?.carrierInformationVO.driverTelephone || '--'}} / - {{i?.carrierInformationVO.driverLicensePlate || '--'}} - - - {{i?.driverCarModelLabel || '--'}} / {{(i?.driverCarLength || '--') +'米'}} / {{(i?.driverCarWeight || - '--')+'吨'}} -
-

装货卸货信息 + +
+ + 装货卸货信息 + ( + + + ) + +
@@ -166,6 +140,42 @@
+ +
+ + 基本信息 +
+ + + + + {{ item.goodsTypeName }} - {{ item.goodsName }} + + {{ item.weight }}吨,{{ item.volume }}方,{{ item.number }}件 + + {{i?.carrierInformationVO?.driverName || '--'}} / {{i?.carrierInformationVO?.driverTelephone || '--'}} / + {{i?.carrierInformationVO?.driverLicensePlate || '--'}} + + + {{i?.driverCarModelLabel || '--'}} / {{(i?.driverCarLength || '--') +'米'}} / {{(i?.driverCarWeight || + '--')+'吨'}} + + + + + +
@@ -204,7 +214,7 @@
-

+

{{ i?.totalAmount | currency }} @@ -249,7 +259,7 @@

+ [res]="{ reName: { list: 'data.records', total: 'data.total' } }" [size]="'small'">
{{ item?.operator }} {{ item?.telephone ? '/' + item?.telephone : '' }} diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.less b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.less index 172f5525..2fd2b362 100644 --- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.less +++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.less @@ -48,7 +48,7 @@ } .handling-info { - min-height: 176px; + min-height: 100px; border: 1px solid #ccc; .loading-row { @@ -79,6 +79,7 @@ .time-info { margin-left: 56px; + margin-bottom: 0; } } } diff --git a/src/styles/theme.less b/src/styles/theme.less index 1082d2fa..82b97923 100644 --- a/src/styles/theme.less +++ b/src/styles/theme.less @@ -24,3 +24,7 @@ .ant-btn { border-radius: 4px; } + +.ant-card-body { + padding: 16px; +} From 71c2b709dfc5bb59830336a261f7d561a2ca99eb Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 28 Apr 2022 15:11:17 +0800 Subject: [PATCH 04/15] edit --- .../driver-account.component.ts | 1 + .../platform-account.component.ts | 24 +++++++++++-------- .../financial-managemen-routing.module.ts | 8 +++---- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/src/app/routes/financial-management/components/driver-account/driver-account.component.ts b/src/app/routes/financial-management/components/driver-account/driver-account.component.ts index c1404e1f..47e3e0cc 100644 --- a/src/app/routes/financial-management/components/driver-account/driver-account.component.ts +++ b/src/app/routes/financial-management/components/driver-account/driver-account.component.ts @@ -186,6 +186,7 @@ export class DriverAccountComponent extends BasicTableComponent implements OnIni buttons: [ { text: '查看明细', + acl: { ability: ['FINANCIAL-DRIVER-ACOUNT-view'] }, click: item => this.router.navigate(['/financial-management/driver-account/detail/' + item.id], { queryParams: { diff --git a/src/app/routes/financial-management/components/platform-account/platform-account.component.ts b/src/app/routes/financial-management/components/platform-account/platform-account.component.ts index 1cfb6a07..0fda4eae 100644 --- a/src/app/routes/financial-management/components/platform-account/platform-account.component.ts +++ b/src/app/routes/financial-management/components/platform-account/platform-account.component.ts @@ -23,7 +23,12 @@ export class PlatformAccountComponent implements OnInit { info: any = {}; static: any = {}; - constructor(public service: FreightAccountService, private router: Router, private nzModalService: NzModalService, public modal: NzModalService) { } + constructor( + public service: FreightAccountService, + private router: Router, + private nzModalService: NzModalService, + public modal: NzModalService + ) {} ngOnInit(): void { this.loadInfo(); @@ -187,6 +192,7 @@ export class PlatformAccountComponent implements OnInit { buttons: [ { text: '查看明细 ', + acl: { ability: ['FINANCIAL-PLATFORM-view'] }, click: item => this.router.navigate(['/financial-management/platform-account/detail/' + item.id], { queryParams: { ltdId: item.ltdId, bankType: item.bankType, ltdName: `${item.ltdName}(${item.bankTypeLabel})` } @@ -195,7 +201,7 @@ export class PlatformAccountComponent implements OnInit { { text: '提现', click: item => this.withdraw(item), - iif: (_record) => _record.bankType !== '1' + iif: _record => _record.bankType !== '1' }, // { // text: '绑定银行卡', @@ -204,8 +210,8 @@ export class PlatformAccountComponent implements OnInit { { text: '查看银行卡', click: item => this.viewBankcard(item), - iif: (_record) => _record.bankType !== '1' - }, + iif: _record => _record.bankType !== '1' + } ] } ]; @@ -224,10 +230,9 @@ export class PlatformAccountComponent implements OnInit { i: item } }); - modalRef.afterOpen.subscribe(() => { }); - modalRef.afterClose.subscribe((result) => { + modalRef.afterOpen.subscribe(() => {}); + modalRef.afterClose.subscribe(result => { if (result) this.st.reload(); - }); } @@ -244,7 +249,7 @@ export class PlatformAccountComponent implements OnInit { } exportList() { - this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportPlatformAccountBalanceByOperator,); + this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportPlatformAccountBalanceByOperator); } // 提现 @@ -264,7 +269,6 @@ export class PlatformAccountComponent implements OnInit { // this.getSummary(); // this.withdrawTable.refresh(); } - }) + }); } - } diff --git a/src/app/routes/financial-management/financial-managemen-routing.module.ts b/src/app/routes/financial-management/financial-managemen-routing.module.ts index c29dc430..1511a500 100644 --- a/src/app/routes/financial-management/financial-managemen-routing.module.ts +++ b/src/app/routes/financial-management/financial-managemen-routing.module.ts @@ -38,10 +38,10 @@ import { CwcBankCardManagementIndexComponent } from './components/bank-card-mana const routes: Routes = [ { path: 'freight-account', component: FreightAccountComponent, data: { guard: { ability: ['FINANCIAL-FREIGHT-ACOUNT-list'] } } }, { path: 'freight-account/detail/:id', component: FreightAccountDetailComponent }, - { path: 'driver-account', component: DriverAccountComponent }, - { path: 'driver-account/detail/:id', component: DriverAccountDetailComponent }, - { path: 'platform-account', component: PlatformAccountComponent }, - { path: 'platform-account/detail/:id', component: PlatformAccountDetailComponent }, + { path: 'driver-account', component: DriverAccountComponent, data: { guard: { ability: ['FINANCIAL-DRIVER-ACOUNT-list'] } } }, + { path: 'driver-account/detail/:id', component: DriverAccountDetailComponent, data: { guard: { ability: ['FINANCIAL-DRIVER-ACOUNT-DETAIL-view'] } } }, + { path: 'platform-account', component: PlatformAccountComponent , data: { guard: { ability: ['FINANCIAL-PLATFORM-list'] } } }, + { path: 'platform-account/detail/:id', component: PlatformAccountDetailComponent , data: { guard: { ability: ['FINANCIAL-PLATFORM-DETAIL-detail'] } } }, { path: 'recharge-record', component: RechargeRecordComponent }, { path: 'withdrawals-record', component: WithdrawalsRecordComponent }, { path: 'withdrawals-record/detail/:id', component: WithdrawalsDetailComponent }, From 88e6dfcd65d2cb7a72968c5d234549a2516186b5 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 28 Apr 2022 15:15:07 +0800 Subject: [PATCH 05/15] edit --- .../insurance-management-routing.module.ts | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/app/routes/insurance-management/insurance-management-routing.module.ts b/src/app/routes/insurance-management/insurance-management-routing.module.ts index 1ff630fd..d9348af8 100644 --- a/src/app/routes/insurance-management/insurance-management-routing.module.ts +++ b/src/app/routes/insurance-management/insurance-management-routing.module.ts @@ -1,5 +1,5 @@ /* - * @Description : + * @Description : * @Version : 1.0 * @Author : Shiming * @Date : 2022-01-06 09:24:00 @@ -13,13 +13,12 @@ import { RouterModule, Routes } from '@angular/router'; import { insuranceManagementListComponent } from './components/list/list.component'; import { insuranceManagementSetComponent } from './components/set/set.component'; - const routes: Routes = [ - { path: 'list', component: insuranceManagementListComponent }, - { path: 'list-set', component: insuranceManagementSetComponent }, -] + { path: 'list', component: insuranceManagementListComponent, data: { guard: { ability: ['INSURANCE-LIST-search'] } } }, + { path: 'list-set', component: insuranceManagementSetComponent, data: { guard: { ability: ['INSURANCE-LISTDETAIL-set'] } } } +]; @NgModule({ imports: [RouterModule.forChild(routes)], exports: [RouterModule] }) -export class InsuranceManagementRoutingModule { } +export class InsuranceManagementRoutingModule {} From 7c4b440e8eadd89ee3bf197bdaf960781ea85079 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 28 Apr 2022 15:19:43 +0800 Subject: [PATCH 06/15] 9034 --- .../goods-name-config.component.html | 18 ++++++++++++------ .../goods-name-config.component.ts | 4 ++++ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/app/routes/sys-setting/components/goods-name-config/goods-name-config.component.html b/src/app/routes/sys-setting/components/goods-name-config/goods-name-config.component.html index db84f3c8..180dc545 100644 --- a/src/app/routes/sys-setting/components/goods-name-config/goods-name-config.component.html +++ b/src/app/routes/sys-setting/components/goods-name-config/goods-name-config.component.html @@ -14,10 +14,14 @@
    -
  • 编辑
    • -
  • 上移
    • -
  • 下移
    • -
  • 删除
    • +
  • 编辑
    • +
  • 上移
    • +
  • 下移
    • +
  • 删除
 @@ -25,7 +29,8 @@
-
@@ -39,7 +44,8 @@ -
diff --git a/src/app/routes/sys-setting/components/goods-name-config/goods-name-config.component.ts b/src/app/routes/sys-setting/components/goods-name-config/goods-name-config.component.ts index 4806f3d7..0d3cf1d9 100644 --- a/src/app/routes/sys-setting/components/goods-name-config/goods-name-config.component.ts +++ b/src/app/routes/sys-setting/components/goods-name-config/goods-name-config.component.ts @@ -28,18 +28,22 @@ export class GoodsNameConfigComponent implements OnInit { buttons: [ { text: '编辑', + acl: { ability: ['SYSTEM-GOODS-NAME-CONFIG-edit'] }, click: item => this.typeItemAction(item) }, { text: '上移', + acl: { ability: ['SYSTEM-GOODS-NAME-CONFIG-sort'] }, click: item => this.sortTypeItem(item, 3) }, { text: '下移', + acl: { ability: ['SYSTEM-GOODS-NAME-CONFIG-sort'] }, click: item => this.sortTypeItem(item, 4) }, { text: '删除', + acl: { ability: ['SYSTEM-GOODS-NAME-CONFIG-delete'] }, click: item => this.removeTypeItem(item) } ] From e233980308c4d49e3365c8fd3d7dafaf135ece5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= Date: Thu, 28 Apr 2022 15:34:14 +0800 Subject: [PATCH 07/15] =?UTF-8?q?UI=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bulk-detail/bulk-detail.component.html | 40 ++++++++++++------- .../vehicle-detail.component.html | 16 ++++---- 2 files changed, 33 insertions(+), 23 deletions(-) diff --git a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html index b1beb110..020c7594 100644 --- a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html @@ -6,11 +6,19 @@ -
+
-

货源编码 : {{ i?.resourceCode }}

+ 货源编码 : {{ i?.resourceCode }}
-
+
+ + + +
+
+ {{ i?.shipperAppUserName }} {{ i?.enterpriseProjectName }} {{ i?.deadlineTime }} {{ i?.createUserName }}/{{ i?.createUserPhone }} @@ -37,12 +46,11 @@ -
- -

货源编码 : {{ i?.resourceCode }}

-
-
-
网络货运人：{{ i?.shipperAppUserName }}
+
+
+ + 货源编码 : {{ i?.resourceCode }} +
@@ -59,6 +67,7 @@
-->
+ {{ i?.shipperAppUserName }} {{ i?.enterpriseProjectName }} {{ i?.deadlineTime }} {{ i?.createUserName }}/{{ i?.createUserPhone }} @@ -174,21 +183,22 @@
运费信息 + (到货后{{i?.paymentDays}}天内支付运费)
-
-

收货后{{ i?.paymentDays }}天内支付运费

-

{{ settlementBasis[item?.settlementBasis] }}，{{ rule[item?.rule] }}

-
-
{{ item?.freightPrice | currency: '￥' }} {{ freightType[item?.freightType] }} （附加费率{{i?.rate * 100 | number: '0.2-2'}}%）
+ +
+ +

{{ settlementBasis[item?.settlementBasis] }}，{{ rule[item?.rule] }}

+
diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html index 43c1da1b..94f27bc7 100644 --- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html @@ -8,13 +8,12 @@ -
- -

货源编码 : {{ i?.resourceCode }}

-
-
-
网络货运人：{{ i?.enterpriseInfoName }}
-
+
+
+ + 货源编码 : {{ i?.resourceCode }} +
+
--> -
+
+ {{ i?.enterpriseInfoName }} {{ i?.externalResourceCode }} {{ i?.enterpriseProjectName }} {{ i?.createUserName }}/{{ i?.createUserPhone }} From dc64c78694d021538a41ff557c22aa3e0862be4a Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 28 Apr 2022 15:36:26 +0800 Subject: [PATCH 08/15] 8033 --- proxy.conf.js | 2 +- .../components/api-auth/api-auth.component.html | 8 ++++---- .../components/api-auth/api-auth.component.ts | 17 +++++++++++++++-- .../menu-manager/menu-manager-routing.module.ts | 6 +++--- 4 files changed, 23 insertions(+), 10 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index 4690cd30..d18ecb48 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/menu-manager/components/api-auth/api-auth.component.html b/src/app/routes/menu-manager/components/api-auth/api-auth.component.html index f1d7c7f0..86ffe160 100644 --- a/src/app/routes/menu-manager/components/api-auth/api-auth.component.html +++ b/src/app/routes/menu-manager/components/api-auth/api-auth.component.html @@ -23,8 +23,8 @@ - - + + + [nzLoading]="service.http.loading" *ngIf="isShowFre || isShowBackEND"> @@ -65,7 +65,7 @@ {{ item.sorted }} - 权限配置 + 权限配置 diff --git a/src/app/routes/menu-manager/components/api-auth/api-auth.component.ts b/src/app/routes/menu-manager/components/api-auth/api-auth.component.ts index c61cab04..f6004b13 100644 --- a/src/app/routes/menu-manager/components/api-auth/api-auth.component.ts +++ b/src/app/routes/menu-manager/components/api-auth/api-auth.component.ts @@ -1,4 +1,5 @@ import { Component, OnInit, ViewChild } from '@angular/core'; +import { ACLService } from '@delon/acl'; import { SFComponent, SFSchema } from '@delon/form'; import { EAEnvironmentService } from '@shared'; import { NzDrawerService } from 'ng-zorro-antd/drawer'; @@ -34,14 +35,26 @@ export class ApiAuthComponent implements OnInit { mapOfExpandedData: { [key: string]: any[] } = {}; listOfMapData: any[] = []; - constructor(private envSrv: EAEnvironmentService, public service: MenuManagerService, private drawer: NzDrawerService) { + + isShowBackEND = false; + isShowFre = false; + + constructor( + private envSrv: EAEnvironmentService, + public service: MenuManagerService, + private drawer: NzDrawerService, + private acl: ACLService + ) { + const acls = acl.data.abilities || []; + this.isShowBackEND = acl.data.full || !!acls.find(acl => acl === 'MENU-AUTH-obclist'); + this.isShowFre = acl.data.full || !!acls.find(acl => acl === 'MENU-AUTH-smclist'); this.initData(); } ngOnInit(): void {} initData(): void { - this.selectedPlatform = this.platforms[0]; + this.selectedPlatform = this.isShowFre ? this.platforms[0] : this.platforms[1]; this.loadMemu(this.selectedPlatform.appId); } diff --git a/src/app/routes/menu-manager/menu-manager-routing.module.ts b/src/app/routes/menu-manager/menu-manager-routing.module.ts index d46c398f..30dde843 100644 --- a/src/app/routes/menu-manager/menu-manager-routing.module.ts +++ b/src/app/routes/menu-manager/menu-manager-routing.module.ts @@ -5,12 +5,12 @@ import { MenuManagerComponentsIndexComponent } from './components/index/index.co const routes: Routes = [ { path: '', redirectTo: 'index', pathMatch: 'full' }, - { path: 'index', component: MenuManagerComponentsIndexComponent }, - { path: 'auth', component: ApiAuthComponent }, + { path: 'index', component: MenuManagerComponentsIndexComponent, data: { guard: { ability: ['MENU-INDEX-obclist'] } } }, + { path: 'auth', component: ApiAuthComponent, data: { guard: { ability: ['MENU-AUTH-obclist', 'MENU-AUTH-smclist'] } } } ]; @NgModule({ imports: [RouterModule.forChild(routes)], - exports: [RouterModule], + exports: [RouterModule] }) export class MenuManagerRoutingModule {} From 1fab74e445262c04f2b8e86cb425a0436beea04d Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 28 Apr 2022 16:04:37 +0800 Subject: [PATCH 09/15] edit --- .../dynamic-setting-h5.component.html | 16 ++++++++++------ .../dynamic-setting-h5.component.ts | 11 +++++++++++ 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html index 3d52444d..5df97748 100644 --- a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html +++ b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html @@ -112,19 +112,23 @@
- - + [nzShowUploadList]="{showPreviewIcon:true,showRemoveIcon:true}" + [nzFileList]="item.itemValue?[{uid:item.id,name:'',url:item.itemValue}]:[]" + (nzChange)="uploadChange($event,item)" [nzLimit]="1" + [nzShowButton]="filst?.nzFileList?.length===0 " [nzPreview]="nzPreview" + [nzRemove]="nzRemove"> +
上传
- -
+

支持 diff --git a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts index 5c3b0261..a3013280 100644 --- a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts +++ b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts @@ -98,6 +98,17 @@ export class DynamicSettingH5Component implements OnInit { } } + nzPreview = (file: NzUploadFile) => { + this.showImg(file.url); + }; + nzRemove = (file: NzUploadFile) => { + const config = this.configList.find((c: any) => c.id === file.uid); + if (config) { + config.itemValue = ''; + } + return true; + }; + showImg(url: any) { this.nzImageService.preview([{ src: url }]); } From 384a55a1e24be145a7fa469d26ce38cb111edf0d Mon Sep 17 00:00:00 2001 From: weiyu Date: Thu, 28 Apr 2022 16:09:28 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../invoice-reporting.component.html | 7 ++-- .../invoice-reporting.component.ts | 37 +------------------ 2 files changed, 6 insertions(+), 38 deletions(-) diff --git a/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.html b/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.html index 010dee32..6784c8fd 100644 --- a/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.html +++ b/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.html @@ -9,7 +9,7 @@

- +
- +
diff --git a/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts b/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts index 9ec54f1a..4bf92d71 100644 --- a/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts +++ b/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts @@ -281,26 +281,7 @@ export class TaxManagementInvoiceReportingComponent implements OnInit { }); } - /** - *撤销 - * @param record 记录实例 - */ - resetData() { - if (this.selectedRows.length === 0) { - this.openWainingModal('请选择需要更新的数据！'); - return; - } - let params: any[] = []; - this.selectedRows.forEach(item => { - params.push(item.billId); - }); - this.service.request(this.service.$api_get_renewalOrderById, params).subscribe((res: any) => { - if (res) { - this.service.msgSrv.success('更新成功'); - this.st.load(1); - } - }) - } + /** *撤销 * @param record 记录实例 @@ -333,28 +314,13 @@ export class TaxManagementInvoiceReportingComponent implements OnInit { } selectChange(item: any) { - console.log(item); - this.selectedIndex = item?.value || ''; - console.log(this.selectedIndex); setTimeout(() => { this.st.load(); }) } - /** - * 查看当行数据 - */ - view(record: STData) { - // this.router.navigate(['../view', record.uuid], { relativeTo: this.ar }); - this.router.navigate(['../detail'], { - queryParams: { - id: record.id, - }, - relativeTo: this.ar - }); - } /** * 上传 @@ -368,6 +334,7 @@ export class TaxManagementInvoiceReportingComponent implements OnInit { this.selectedRows.forEach(item => { params.push(item.id); }); + return; //TODO 接口未提供 this.service.request(this.service.$api_get_uploadingTaxOrder, params).subscribe((res: any) => { if (res) { this.service.msgSrv.success('上传成功'); From 258e930fed94eb72474f448261e998c4a119d722 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 28 Apr 2022 16:21:57 +0800 Subject: [PATCH 11/15] edit --- .../components/index/index.component.html | 17 +++++++------ .../components/index/index.component.ts | 25 ++++++++++++++----- .../menu-manager-routing.module.ts | 6 ++++- 3 files changed, 33 insertions(+), 15 deletions(-) diff --git a/src/app/routes/menu-manager/components/index/index.component.html b/src/app/routes/menu-manager/components/index/index.component.html index 8b1acd73..3577b04b 100644 --- a/src/app/routes/menu-manager/components/index/index.component.html +++ b/src/app/routes/menu-manager/components/index/index.component.html @@ -23,14 +23,15 @@ - - + +
- - + + + [nzLoading]="service.http.loading" *ngIf="isShowFre || isShowBackEND"> @@ -85,12 +86,12 @@ 查看 - 编辑 + 编辑 - 删除 + 删除 - 新增子项 + 新增子项 diff --git a/src/app/routes/menu-manager/components/index/index.component.ts b/src/app/routes/menu-manager/components/index/index.component.ts index 2f9b1306..3cd5cf8c 100644 --- a/src/app/routes/menu-manager/components/index/index.component.ts +++ b/src/app/routes/menu-manager/components/index/index.component.ts @@ -1,5 +1,6 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { STComponent, STColumn, STRequestOptions, STChange } from '@delon/abc/st'; +import { ACLService } from '@delon/acl'; import { SFComponent, SFSchema } from '@delon/form'; import { Menu, ModalHelper } from '@delon/theme'; import { EAEnvironmentService } from '@shared'; @@ -37,14 +38,26 @@ export class MenuManagerComponentsIndexComponent implements OnInit { mapOfExpandedData: { [key: string]: any[] } = {}; listOfMapData: any[] = []; - constructor(private envSrv: EAEnvironmentService, public service: MenuManagerService, private modal: NzModalService, private modalHelper: ModalHelper,) { + + isShowBackEND = false; + isShowFre = false; + constructor( + private envSrv: EAEnvironmentService, + public service: MenuManagerService, + private modal: NzModalService, + private modalHelper: ModalHelper, + private acl: ACLService + ) { + const acls = acl.data.abilities || []; + this.isShowBackEND = acl.data.full || !!acls.find(acl => acl === 'MENU-INDEX-obclist'); + this.isShowFre = acl.data.full || !!acls.find(acl => acl === 'MENU-INDEX-smclist'); this.initData(); } ngOnInit(): void {} initData(): void { - this.selectedPlatform = this.platforms[0]; + this.selectedPlatform = this.isShowFre ? this.platforms[0] : this.platforms[1]; this.loadMemu(this.selectedPlatform.appId); } @@ -126,13 +139,13 @@ export class MenuManagerComponentsIndexComponent implements OnInit { } }); } - menuSort(){ + menuSort() { const dialogData = { appId: this.selectedPlatform.appId }; - this.modalHelper.create(MenuManagerMenusortComponent, { i: dialogData }, { size: 900 }).subscribe((res:any) => { - if(res) { - console.log('a') + this.modalHelper.create(MenuManagerMenusortComponent, { i: dialogData }, { size: 900 }).subscribe((res: any) => { + if (res) { + console.log('a'); this.loadMemu(this.selectedPlatform.appId); } }); diff --git a/src/app/routes/menu-manager/menu-manager-routing.module.ts b/src/app/routes/menu-manager/menu-manager-routing.module.ts index 30dde843..4879b5aa 100644 --- a/src/app/routes/menu-manager/menu-manager-routing.module.ts +++ b/src/app/routes/menu-manager/menu-manager-routing.module.ts @@ -5,7 +5,11 @@ import { MenuManagerComponentsIndexComponent } from './components/index/index.co const routes: Routes = [ { path: '', redirectTo: 'index', pathMatch: 'full' }, - { path: 'index', component: MenuManagerComponentsIndexComponent, data: { guard: { ability: ['MENU-INDEX-obclist'] } } }, + { + path: 'index', + component: MenuManagerComponentsIndexComponent, + data: { guard: { ability: ['MENU-INDEX-obclist', 'MENU-INDEX-smclist'] } } + }, { path: 'auth', component: ApiAuthComponent, data: { guard: { ability: ['MENU-AUTH-obclist', 'MENU-AUTH-smclist'] } } } ]; From 772b5206b75029d18b786f8ec42e8363970bd8d3 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 28 Apr 2022 16:31:47 +0800 Subject: [PATCH 12/15] edit --- .../cart-config/cart-config.component.html | 12 ++++-- .../cart-config/cart-config.component.ts | 42 +++++++++++++++++-- 2 files changed, 46 insertions(+), 8 deletions(-) diff --git a/src/app/routes/sys-setting/components/cart-config/cart-config.component.html b/src/app/routes/sys-setting/components/cart-config/cart-config.component.html index c5cfa144..00d6b58b 100644 --- a/src/app/routes/sys-setting/components/cart-config/cart-config.component.html +++ b/src/app/routes/sys-setting/components/cart-config/cart-config.component.html @@ -1,7 +1,11 @@ - + + + + + @@ -22,10 +26,10 @@
- +
+ [req]="{process: beforeReq }" [res]="{ process: afterRes }" [loading]="loading" [scroll]="{ y: '370px' }"> \ No newline at end of file diff --git a/src/app/routes/sys-setting/components/cart-config/cart-config.component.ts b/src/app/routes/sys-setting/components/cart-config/cart-config.component.ts index b7039fb0..0682a22e 100644 --- a/src/app/routes/sys-setting/components/cart-config/cart-config.component.ts +++ b/src/app/routes/sys-setting/components/cart-config/cart-config.component.ts @@ -1,5 +1,6 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit, ViewChild } from '@angular/core'; import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st'; +import { ACLService } from '@delon/acl'; import { SFComponent, SFSchema } from '@delon/form'; import { NzModalService } from 'ng-zorro-antd/modal'; import { SystemService } from '../../services/system.service'; @@ -20,17 +21,20 @@ export class CartConfigComponent implements OnInit { { name: '车型配置', type: 1, - isActived: false + isActived: false, + isShow: true }, { name: '车长配置', type: 2, - isActived: false + isActived: false, + isShow: true }, { name: '禁限物品名单', type: 3, - isActived: false + isActived: false, + isShow: true } ]; tabType = 1; @@ -102,10 +106,12 @@ export class CartConfigComponent implements OnInit { buttons: [ { text: '编辑', + acl: { ability: ['SYSTEM-CART-CONFIG-edit'] }, click: item => this.configAction(item) }, { text: '删除', + acl: { ability: ['SYSTEM-CART-CONFIG-delete'] }, click: item => this.deleteAction(item) } ] @@ -113,7 +119,35 @@ export class CartConfigComponent implements OnInit { ]; loading = true; - constructor(public service: SystemService, private nzModalService: NzModalService, private cdr: ChangeDetectorRef) {} + constructor( + public service: SystemService, + private nzModalService: NzModalService, + private cdr: ChangeDetectorRef, + private acl: ACLService + ) { + const acls = acl.data.abilities || []; + this.tabs = [ + { + name: '车型配置', + type: 1, + isActived: false, + isShow: acl.data.full || !!acls.find(acl => acl === 'SYSTEM-CART-CONFIG-modeList') + }, + { + name: '车长配置', + type: 2, + isActived: false, + isShow: acl.data.full || !!acls.find(acl => acl === 'SYSTEM-CART-CONFIG-cartLength') + }, + { + name: '禁限物品名单', + type: 3, + isActived: false, + isShow: acl.data.full || !!acls.find(acl => acl === 'SYSTEM-CART-CONFIG-goodsList') + } + ]; + this.tabType = this.tabs.find(tab => tab.isShow)?.type || 1; + } ngOnInit(): void {} From a95adb929974c34feccfbce3a24cee7fea451289 Mon Sep 17 00:00:00 2001 From: weiyu Date: Thu, 28 Apr 2022 16:31:58 +0800 Subject: [PATCH 13/15] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/billing-order/billing-order.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/ticket-management/components/billing-order/billing-order.component.html b/src/app/routes/ticket-management/components/billing-order/billing-order.component.html index 047cdf2a..e6588a35 100644 --- a/src/app/routes/ticket-management/components/billing-order/billing-order.component.html +++ b/src/app/routes/ticket-management/components/billing-order/billing-order.component.html @@ -11,9 +11,9 @@
- + - +