From 86a10c17577a4078d55d6d6969039e67cb8ef2cd Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 29 Apr 2022 10:00:15 +0800 Subject: [PATCH 01/17] fix bug --- .../partner-detail.component.html | 2 +- .../freight/list/detail/detail.component.html | 2 +- .../audit/detail/detail.component.html | 23 ++++++++++++++++++- .../audit/detail/detail.component.ts | 4 ++++ 4 files changed, 28 insertions(+), 3 deletions(-) diff --git a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html index 83110997..32115fda 100644 --- a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html +++ b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html @@ -162,7 +162,7 @@ nzTheme="fill" class="mr-xs">通过

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 490143b2..9da6addd 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 @@ -139,7 +139,7 @@ nzTheme="fill" class="mr-xs">通过

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 608a8bb0..7b9536d8 100644 --- a/src/app/routes/vehicle/components/audit/detail/detail.component.html +++ b/src/app/routes/vehicle/components/audit/detail/detail.component.html @@ -85,6 +85,17 @@ + + + + + - + + + + Date: Fri, 29 Apr 2022 10:02:43 +0800 Subject: [PATCH 02/17] fix bug --- .../list/detail/detail.component.html | 24 ++++++++++++++++++- .../list/detail/detail.component.ts | 5 ++++ 2 files changed, 28 insertions(+), 1 deletion(-) 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 f868a506..513c7e00 100644 --- a/src/app/routes/vehicle/components/list/detail/detail.component.html +++ b/src/app/routes/vehicle/components/list/detail/detail.component.html @@ -72,6 +72,17 @@ + + + + + - + + + + + diff --git a/src/app/routes/vehicle/components/list/detail/detail.component.ts b/src/app/routes/vehicle/components/list/detail/detail.component.ts index 50a20048..418b62b2 100644 --- a/src/app/routes/vehicle/components/list/detail/detail.component.ts +++ b/src/app/routes/vehicle/components/list/detail/detail.component.ts @@ -41,6 +41,7 @@ export class VehicleComponentsListDetailComponent implements OnInit { contenCarNoColor: any; contencarModel: any; contenCarLength: any; + contenCarEnergy: any; constructor( private http: _HttpClient, @@ -158,6 +159,8 @@ export class VehicleComponentsListDetailComponent implements OnInit { this.Serveice('car:color'); this.Serveice('car:model'); this.Serveice('car:length'); + this.Serveice('car:energy:type'); + } Serveice(param: any) { let value: any; @@ -172,6 +175,8 @@ export class VehicleComponentsListDetailComponent implements OnInit { this.contencarModel = res; } else if (param === 'car:length') { this.contenCarLength = res; + } else if (param === 'car:energy:type') { + this.contenCarEnergy = res; } }); return value; From 88e4ac5fab462b1c8233563a9a58df78a8523ad0 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 29 Apr 2022 10:21:53 +0800 Subject: [PATCH 03/17] fix bug --- .../network-freight.component.html | 4 +-- .../network-freight.component.ts | 15 +++++++---- .../network-freight/new/new.component.html | 27 ++++++++++--------- .../network-freight/new/new.component.ts | 7 ----- 4 files changed, 27 insertions(+), 26 deletions(-) diff --git a/src/app/routes/sys-setting/components/network-freight/network-freight.component.html b/src/app/routes/sys-setting/components/network-freight/network-freight.component.html index 50da782f..e234be75 100644 --- a/src/app/routes/sys-setting/components/network-freight/network-freight.component.html +++ b/src/app/routes/sys-setting/components/network-freight/network-freight.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-24 15:54:08 * @LastEditors : Shiming - * @LastEditTime : 2022-03-24 11:10:44 + * @LastEditTime : 2022-04-29 10:20:21 * @FilePath : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\network-freight\\network-freight.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -48,7 +48,7 @@
- +
', - click: item => this.creat(item) + click: item => this.creat(item), + acl: { ability: ['SYSTEM-NETWORK-FREIGHT-basicSetting'] }, }, { text: '财务设置
', - click: item => this.ticket(item) + click: item => this.ticket(item), + acl: { ability: ['SYSTEM-NETWORK-FREIGHT-finanical'] }, }, { text: '充值账户
', - click: item => this.settingPay(item) + click: item => this.settingPay(item), + acl: { ability: ['SYSTEM-NETWORK-FREIGHT-TOPUP'] }, }, { text: '应用设置
', - click: item => this.settingApp(item) + click: item => this.settingApp(item), + acl: { ability: ['SYSTEM-NETWORK-FREIGHT-APPLY'] }, }, { text: '系统配置
', - click: item => this.settingAction(item) + click: item => this.settingAction(item), + acl: { ability: ['SYSTEM-NETWORK-FREIGHT-SYSTEMCONFIG'] }, }, // { // text: '合同设置', diff --git a/src/app/routes/sys-setting/components/network-freight/new/new.component.html b/src/app/routes/sys-setting/components/network-freight/new/new.component.html index d509f252..ad77da91 100644 --- a/src/app/routes/sys-setting/components/network-freight/new/new.component.html +++ b/src/app/routes/sys-setting/components/network-freight/new/new.component.html @@ -8,7 +8,12 @@ * @FilePath : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\network-freight\\new\\new.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> - + + + @@ -17,15 +22,13 @@
正面照
示例
-
+
-
-
- 请上传道运证照片，支持JPG、PNG格式，文件小于5M。蓝牌绿牌车辆，可不用传道运证 -
-
+
+
请上传道运证照片，支持JPG、PNG格式，文件小于5M。蓝牌绿牌车辆，可不用传道运证
+
@@ -42,14 +45,14 @@ -
营业执照法人信息
+
营业执照法人信息
 -
道运证信息
+
道运证信息
 - +
请上传身份证原件的高清照片，若上传复印件，则需申请人签字；
@@ -83,7 +86,7 @@
- +
- \ No newline at end of file + diff --git a/src/app/routes/sys-setting/components/network-freight/new/new.component.ts b/src/app/routes/sys-setting/components/network-freight/new/new.component.ts index 70658250..b8736ed2 100644 --- a/src/app/routes/sys-setting/components/network-freight/new/new.component.ts +++ b/src/app/routes/sys-setting/components/network-freight/new/new.component.ts @@ -180,14 +180,8 @@ export class NetworkFreightNewComponent implements OnInit { if (this.sf1.value.isLoingDate) { this.sf1.value.operatingEndTime = ''; } - console.log(this.sf1.value); - console.log(this.sf1.valid); - console.log(this.sf?.value); - console.log(this.sf.valid); const sfVlaue = this.sf1.value; const params: any = {}; - console.log(this.sf1.value); - Object.assign(params, { ...this.sf?.value, enterpriseInfoDTO: { @@ -203,7 +197,6 @@ export class NetworkFreightNewComponent implements OnInit { roadTransportLicenceNo: this.sf1.value.legalPersonIdentityVO.roadTransportLicenceNo, //道路运输照片 }); delete params.enterpriseInfoDTO.legalPersonIdentityVO; - console.log(params); params.enterpriseInfoDTO.enterpriseAddressCode = this.sf1.value?.enterpriseAddressCode?.[2]; if (this.route.snapshot.params.id !== 'undefined') { params.id = this.route.snapshot.params.id; From 282a64006bee7f31a883f435952ad8983fc22a50 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 29 Apr 2022 10:30:22 +0800 Subject: [PATCH 04/17] fix bug --- .../routes/order-management/components/bulk/bulk.component.ts | 2 +- .../components/receipts-audit/receipts-audit.component.html | 4 ++-- 2 files changed, 3 insertions(+), 3 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 0a2bb7df..63c7932e 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -528,7 +528,7 @@ export class OrderManagementBulkComponent extends BasicTableComponent implements text: '确认签收', click: _record => this.confirmReceipt(_record), iif: item => item.billStatus == '4', - acl: { ability: ['VEHICLE-LIST-view'] } + acl: { ability: ['ORDER-BULK-signBulkOrder'] } }, { text: '取消订单', diff --git a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html index d367d660..6fb9d4f8 100644 --- a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html +++ b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-04-06 11:06:05 + * @LastEditTime : 2022-04-29 10:29:12 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\receipts-audit\\receipts-audit.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -118,7 +118,7 @@
- + From 2e4c264ee0cc67fce0de559972ddc0fbf656d1de Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 29 Apr 2022 10:42:04 +0800 Subject: [PATCH 05/17] fix bug --- .../abnormal-warning.component.html | 31 ++++++++------- .../order-management-routing.module.ts | 38 ++++++++++++------- 2 files changed, 40 insertions(+), 29 deletions(-) diff --git a/src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.html b/src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.html index 26129d7a..e5312e5c 100644 --- a/src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.html +++ b/src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-04-08 16:34:26 + * @LastEditTime : 2022-04-29 10:41:20 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\abnormal-warning\\abnormal-warning.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -35,25 +35,27 @@
- - + +
- - - + [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" + [loading]="false" + > -
{{ item?.driverName }}{{ item?.driverPhone ? "/" + item?.driverPhone : '' }}
+
{{ item?.driverName }}{{ item?.driverPhone ? '/' + item?.driverPhone : '' }}
-
{{ item?.longitude }} - {{ item?.latitude ? "," + item?.latitude : '' }}
+
{{ item?.longitude }} {{ item?.latitude ? ',' + item?.latitude : '' }}
+
- + {{i?.goodsInfos?.[0]?.goodsName}} - - {{i?.goodsInfos?.[0]?.weight}}吨,{{i?.goodsInfos?.[0]?.volume}}方,{{i?.goodsInfos?.[0]?.number}}件 @@ -204,60 +203,70 @@
车队长：{{ i?.payeeName }}/{{ i?.payeePhone }}
- -
- - 附件信息 +
+
+ +
+ + 附件信息 +
+
+ + + 查看附件      + 补充协议 + + + + + + + + + + + + +
+
- - - 查看附件      - 补充协议 - - - - - - - - - - - - - - -
- - 补充信息 -
- - - {{i?.receiptType == 1 ?'是':'否'}} - - - {{i?.receiptTypeLabel}} - - - {{i?.receiptUser}} / {{i?.receiptUserPhone}} - - - {{i?.receiptPlace}} - - - {{i?.receiptAddress}} - +
+ +
+ + 补充信息 +
+
+ + + {{i?.receiptType == 1 ?'是':'否'}} + + + {{i?.receiptTypeLabel}} + - - - - - - - {{i?.goodsResource?.remarks}} - - - + + {{i?.receiptUser}} / {{i?.receiptUserPhone}} + + + {{i?.receiptPlace}} + + + {{i?.receiptAddress}} + + + {{i?.goodsResource?.remarks}} + + + + + +
+ +
+

| 轨迹信息

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 e048bdc3..f21d4a47 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 @@ -129,12 +129,10 @@ 基本信息
- + {{i?.goodsInfos?.[0]?.goodsName}} - - {{i?.goodsInfos?.[0]?.weight}}吨,{{i?.goodsInfos?.[0]?.volume}}方,{{i?.goodsInfos?.[0]?.number}}件 @@ -179,10 +177,10 @@
运费信息 - （到货后{{i?.paymentDays}}天内支付运费） + （到货后{{i?.paymentDays}}天内支付运费）
- + {{ item.price | currency }} @@ -200,62 +198,73 @@
车队长：{{ i?.payee?.name }}/{{ i?.payee?.phone }}/{{ i?.payee?.idNo }}
 +
+
+ +
+ + 附件信息 +
+
+ + + 查看附件      + 补充协议 + + + + - -
- - 附件信息 + + + + + + + + +
+
- - - 查看附件      - 补充协议 - - - - - - - - - - - - - - -
- - 补充信息 +
+ +
+ + 补充信息 +
+
+ + + {{ i?.supplementaryInformationVO?.stateReceipt ? '是' : '否' }} + + + {{ i?.supplementaryInformationVO?.receiptType === '1' ? '电子回单' : '纸质回单' }} + + + {{ + i?.supplementaryInformationVO?.receiptUserName }} / {{ i?.supplementaryInformationVO?.phon }} + + {{ i?.supplementaryInformationVO?.area }} + + + {{ i?.supplementaryInformationVO?.address }} + + + + {{ i?.supplementaryInformationVO?.remarks }} + + + + + + +
+
- - - {{ i?.supplementaryInformationVO?.stateReceipt ? '是' : '否' }} - - - {{ i?.supplementaryInformationVO?.receiptType === '1' ? '电子回单' : '纸质回单' }} - - {{ - i?.supplementaryInformationVO?.receiptUserName }} / {{ i?.supplementaryInformationVO?.phon }} - - {{ i?.supplementaryInformationVO?.area }} - - - {{ i?.supplementaryInformationVO?.address }} - - - {{ i?.supplementaryInformationVO?.remarks }} - - - - - - - - - - - +

| 轨迹信息

diff --git a/src/app/shared/components/imagelist/imagelist.component.html b/src/app/shared/components/imagelist/imagelist.component.html index 10a80404..d5efe61f 100644 --- a/src/app/shared/components/imagelist/imagelist.component.html +++ b/src/app/shared/components/imagelist/imagelist.component.html @@ -1,5 +1,5 @@ @@ -28,17 +28,17 @@ >
- + - +
- - + +
已选择 {{ selectedRows.length }} 条数据 diff --git a/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.html b/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.html index daaaf323..407dba23 100644 --- a/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.html +++ b/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.html @@ -1,3 +1,13 @@ + @@ -11,7 +21,7 @@
- + - + - + +
已选择 {{ selectedRows.length }} 条运单 diff --git a/src/app/routes/ticket-management/components/express-info/express-info.component.html b/src/app/routes/ticket-management/components/express-info/express-info.component.html index e19f3d85..ec192d9d 100644 --- a/src/app/routes/ticket-management/components/express-info/express-info.component.html +++ b/src/app/routes/ticket-management/components/express-info/express-info.component.html @@ -17,7 +17,7 @@
- +
diff --git a/src/app/routes/ticket-management/components/express-info/express-info.component.ts b/src/app/routes/ticket-management/components/express-info/express-info.component.ts index c5d9659a..1cbf2974 100644 --- a/src/app/routes/ticket-management/components/express-info/express-info.component.ts +++ b/src/app/routes/ticket-management/components/express-info/express-info.component.ts @@ -1,3 +1,13 @@ +/* + * @Description : + * @Version : 1.0 + * @Author : Shiming + * @Date : 2022-04-28 20:27:22 + * @LastEditors : Shiming + * @LastEditTime : 2022-04-29 14:14:59 + * @FilePath : \\tms-obc-web\\src\\app\\routes\\ticket-management\\components\\express-info\\express-info.component.ts + * Copyright (C) 2022 huzhenhong. All rights reserved. + */ import { Component, OnInit, ViewChild } from '@angular/core'; import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st'; import { SFComponent, SFDateWidgetSchema, SFSchema } from '@delon/form'; @@ -49,6 +59,7 @@ export class ExpressInfoComponent implements OnInit { width: 120, type: 'link', click: (record: any) => this.showDetail(record.expressCode), + acl: { ability: ['TICKET-EXPRESS-INFO-expressInvoices'] }, className: 'text-right' }, { title: '寄件人姓名', index: 'sname', width: 150 }, diff --git a/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.html b/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.html index 5c6ac9d3..d016b77f 100644 --- a/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.html +++ b/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.html @@ -12,7 +12,7 @@ [class.expend-options]="_$expand"> - + +
已选择 {{ selectedRows.length }} 张发票 diff --git a/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.ts b/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.ts index 5dc512c0..54322cb9 100644 --- a/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.ts +++ b/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.ts @@ -256,10 +256,12 @@ export class InputInvoiceComponent implements OnInit { buttons: [ { text: '浏览', + acl: { ability: ['TICKET-INPUT-INVOICE-view'] }, click: item => this.router.navigate(['/ticket/input-invoice/detail/' + item.id]) }, { text: '修改', + acl: { ability: ['TICKET-INPUT-INVOICE-edit'] }, click: item => this.router.navigate(['/ticket/input-invoice/edit/1']) } ] diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html index 8b2f989e..f88880f2 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-21 15:39:30 * @LastEditors : Shiming - * @LastEditTime : 2022-01-26 09:36:07 + * @LastEditTime : 2022-04-29 13:55:16 * @FilePath : \\tms-obc-web\\src\\app\\routes\\ticket-management\\components\\invoice-requested\\invoice-requested.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -20,7 +20,7 @@
- +
- + + (click)="this.rejectAction(selectedRows)" acl [acl-ability]="['TICKET-INVOICE-REQUESTED-reject']">驳回 - + (click)="changeAddress(selectedRows)" acl [acl-ability]="['VEHICLE-LIST-search']">修改地址 +
diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts index ca3afe4d..cce37763 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts @@ -513,25 +513,30 @@ export class InvoiceRequestedComponent { { text: '开票受理
', click: item => this.requestedInvoiceAction(item), + acl: { ability: ['TICKET-INVOICE-REQUESTED-requestedInvoiceAction'] }, iif: item => item.sts === '1' }, { text: '驳回申请
', click: item => this.rejectAction([item]), + acl: { ability: ['TICKET-INVOICE-REQUESTED-rejectAction'] }, iif: item => item.sts === '1' }, { text: '订单明细
', + acl: { ability: ['TICKET-INVOICE-REQUESTED-detail'] }, click: item => this.router.navigate([`/ticket/invoice-requested/detail/${item?.id}`], { queryParams: { sts: item.sts } }) }, { text: '查看原因
', click: item => this.showReason(item), + acl: { ability: ['TICKET-INVOICE-REQUESTED-viewResult'] }, iif: item => item.sts === '4' }, { text: '下载对账单', iif: item => item.sts === '3', + acl: { ability: ['TICKET-INVOICE-REQUESTED-downloadPDF'] }, click: item => this.downloadPdf(item) } ] diff --git a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts index e818fdd1..dd85d9da 100644 --- a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts +++ b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts @@ -347,6 +347,7 @@ export class InvoicedListComponent implements OnInit { { type: 'divider' }, { text: '查看明细
', + acl: { ability: ['TICKET-INVOICE-LIST-view'] }, click: item => this.router.navigate(['/ticket/invoice-list/detail/' + item.id], { queryParams: { expressno: item.expressno, type: 2, ltdId: item.shipperId } @@ -354,26 +355,31 @@ export class InvoicedListComponent implements OnInit { }, { text: '取消开票
', + acl: { ability: ['TICKET-INVOICE-LIST-canceInvoice'] }, click: item => this.canceInvoice(item), iif: item => item.sts === '1' }, { text: '发票作废
', + acl: { ability: ['TICKET-INVOICE-LIST-deletedInvoice'] }, click: item => this.deletedInvoice(item), iif: item => item.sts === '3' }, { text: '查看物流
', + acl: { ability: ['TICKET-INVOICE-LIST-showExpress'] }, click: item => this.showlogosticsLogs(item), iif: item => item.expresscompany }, { text: '填写物流
', + acl: { ability: ['TICKET-INVOICE-LIST-writeExpress'] }, click: item => this.requestedAction(item), iif: item => !item.expresscompany }, { text: '修改物流
', + acl: { ability: ['TICKET-INVOICE-LIST-updateExpress'] }, click: item => this.requestedAction(item), iif: item => item.expresscompany } diff --git a/src/app/routes/ticket-management/ticket-management-routing.module.ts b/src/app/routes/ticket-management/ticket-management-routing.module.ts index 51369dec..fa616e5c 100644 --- a/src/app/routes/ticket-management/ticket-management-routing.module.ts +++ b/src/app/routes/ticket-management/ticket-management-routing.module.ts @@ -1,3 +1,13 @@ +/* + * @Description : + * @Version : 1.0 + * @Author : Shiming + * @Date : 2022-04-28 20:27:08 + * @LastEditors : Shiming + * @LastEditTime : 2022-04-29 14:40:29 + * @FilePath : \\tms-obc-web\\src\\app\\routes\\ticket-management\\ticket-management-routing.module.ts + * Copyright (C) 2022 huzhenhong. All rights reserved. + */ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { BillingOrderComponent } from './components/billing-order/billing-order.component'; @@ -16,21 +26,21 @@ import { InvoiceRequestedComponent } from './components/invoice-requested/invoic import { InvoicedListComponent } from './components/invoiced-list/invoiced-list.component'; const routes: Routes = [ - { path: 'invoice-requested', component: InvoiceRequestedComponent }, + { path: 'invoice-requested', component: InvoiceRequestedComponent, data: { guard: { ability: ['TICKET-INVOICE-REQUESTED-list'] } } }, { path: 'invoice-requested/detail/:id', component: InvoiceRequestedDetailComponent }, - { path: 'invoice-list', component: InvoicedListComponent }, + { path: 'invoice-list', component: InvoicedListComponent , data: { guard: { ability: ['TICKET-INVOICE-LIST-list'] } }}, { path: 'invoice-list/detail/:id', component: InvoiceDetailComponent }, - { path: 'cancellation-invoice', component: CancellationInvoiceComponent }, + { path: 'cancellation-invoice', component: CancellationInvoiceComponent , data: { guard: { ability: ['TICKET-CANCELLATION-list'] } }}, { path: 'cancellation-invoice/detail/:id', component: InvoiceDetailComponent }, - { path: 'etc-invoice-requested', component: ETCInvoicedRequestedComponent }, - { path: 'etc-invoice-list', component: ETCInvoicedListComponent }, - { path: 'etc-invoiced-logs', component: ETCInvoicedLogsComponent }, - { path: 'etc-blacklist', component: ETCBlacklistComponent }, - { path: 'input-invoice', component: InputInvoiceComponent }, + { path: 'etc-invoice-requested', component: ETCInvoicedRequestedComponent , data: { guard: { ability: ['TICKET-ETC-INVOICE-REQUESTED-list'] } } }, + { path: 'etc-invoice-list', component: ETCInvoicedListComponent, data: { guard: { ability: ['TICKET-ETC-INVOICE-LIST-list'] } } }, + { path: 'etc-invoiced-logs', component: ETCInvoicedLogsComponent , data: { guard: { ability: ['TICKET-ETC-INVOICE-LOGS-list'] } }}, + { path: 'etc-blacklist', component: ETCBlacklistComponent , data: { guard: { ability: ['TICKET-ETC-BLACK_LIST-freightList'] } }}, + { path: 'input-invoice', component: InputInvoiceComponent , data: { guard: { ability: ['TICKET-INPUT-INVOICE-list'] } }}, { path: 'input-invoice/detail/:id', component: InputInvoiceDetailComponent }, { path: 'input-invoice/edit/:id', component: EditCollectionInvoiceComponent }, - { path: 'express-info', component: ExpressInfoComponent }, - { path: 'billing-order', component: BillingOrderComponent } + { path: 'express-info', component: ExpressInfoComponent , data: { guard: { ability: ['TICKET-EXPRESS-INFO-list'] } }}, + { path: 'billing-order', component: BillingOrderComponent, data: { guard: { ability: ['TICKET-BILLING-ORDER-search'] } } } ]; @NgModule({ From cdc839fb8f88e1d216f5600cb6c3b8c4cc4eb1fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= Date: Fri, 29 Apr 2022 15:00:14 +0800 Subject: [PATCH 08/17] =?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.less | 33 ----------------- .../vehicle-detail.component.html | 5 ++- .../vehicle-detail.component.less | 37 ------------------- .../bulk-detail/bulk-detail.component.less | 34 ----------------- .../vehicle-detail.component.less | 35 ------------------ .../vehicle-detail.component.html | 5 ++- src/styles/common/global.less | 2 +- 7 files changed, 7 insertions(+), 144 deletions(-) diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.less b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.less index 2f8ec35b..7086580d 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.less +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.less @@ -32,38 +32,5 @@ padding-right: 100px; } - .handling-info { - min-height: 90px; - border: 1px solid #ccc; - .loading-row { - display: flex; - } - - .handling-info-icon { - width: 32px; - height: 32px; - margin-right: 24px; - color: #fff; - line-height: 32px; - text-align: center; - border-radius: 50%; - - &.loading-bg { - background-color: #50D4AB; - } - - &.unloaing-bg { - background: #F66F6A; - } - } - - .info { - flex: 1; - } - - .time-info { - margin-left: 56px; - } - } } 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 77d86ed1..62179383 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 @@ -194,7 +194,8 @@ 运费信息
- + {{ item.price | currency }} @@ -228,7 +229,7 @@ 补充协议 - + 运费信息 （到货后{{i?.paymentDays}}天内支付运费）
- - + + {{ item.price | currency }} diff --git a/src/styles/common/global.less b/src/styles/common/global.less index ebf343e7..c499a3a5 100644 --- a/src/styles/common/global.less +++ b/src/styles/common/global.less @@ -65,7 +65,7 @@ .handling-info { min-height: 100%; - border: 1px solid #ccc; + border: 1px solid #EAECEF; .loading-row { display: flex; From 17904dcf6c704c12d3755515cdae5e558d86985f Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 29 Apr 2022 15:08:34 +0800 Subject: [PATCH 09/17] fix bug --- .../sys-setting/sys-setting-routing.module.ts | 2 +- .../billing-order/billing-order.component.ts | 81 +++++++++++-------- 2 files changed, 47 insertions(+), 36 deletions(-) diff --git a/src/app/routes/sys-setting/sys-setting-routing.module.ts b/src/app/routes/sys-setting/sys-setting-routing.module.ts index c307b78d..2c2bec33 100644 --- a/src/app/routes/sys-setting/sys-setting-routing.module.ts +++ b/src/app/routes/sys-setting/sys-setting-routing.module.ts @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-12-03 15:23:05 - * @LastEditTime : 2022-04-28 21:40:03 + * @LastEditTime : 2022-04-29 15:08:29 * @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-routing.module.ts diff --git a/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts b/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts index 7edcdb80..57ea5983 100644 --- a/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts +++ b/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts @@ -20,14 +20,14 @@ export class BillingOrderComponent implements OnInit { _$expand = false; - constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router, private ar: ActivatedRoute) { } + constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router, private ar: ActivatedRoute) {} - ngOnInit(): void { } + ngOnInit(): void {} beforeReq = (requestOptions: STRequestOptions) => { if (this.sf) { Object.assign(requestOptions.body, { - ...this.sf?.value, + ...this.sf?.value }); } return requestOptions; @@ -77,34 +77,41 @@ export class BillingOrderComponent implements OnInit { serviceType: { title: '服务类型', type: 'string', - enum: [{ - label: '全部', - value: '' - },{ - label: '整车抢单', - value: 1 - },{ - label: '整车指派', - value: 2 - },{ - label: '大宗抢单', - value: 3 - },{ - label: '大宗指派', - value: 4 - },{ - label: '结算单', - value: 5 - }], + enum: [ + { + label: '全部', + value: '' + }, + { + label: '整车抢单', + value: 1 + }, + { + label: '整车指派', + value: 2 + }, + { + label: '大宗抢单', + value: 3 + }, + { + label: '大宗指派', + value: 4 + }, + { + label: '结算单', + value: 5 + } + ], ui: { - widget: 'select', + widget: 'select' } }, shipperAppUserName: { type: 'string', title: '货主名称', ui: { - placeholder: '请输入', + placeholder: '请输入' } }, vatappcode: { @@ -245,7 +252,7 @@ export class BillingOrderComponent implements OnInit { format: record => `${record.paymentMethodRate}%` }, { title: '货主名称', index: 'shipperAppUserName', width: '180px', className: 'text-center' }, - { title: '所属项目', index: 'enterpriseProjectName', width: '180px', className: 'text-center', }, + { title: '所属项目', index: 'enterpriseProjectName', width: '180px', className: 'text-center' }, { title: '服务类型', render: 'serviceType', @@ -260,30 +267,34 @@ export class BillingOrderComponent implements OnInit { title: '承运司机', index: 'driverName', className: 'text-center', - width: '120px', + width: '120px' }, { title: '车队长', className: 'text-center', width: '120px', - index: 'carCaptainName', + index: 'carCaptainName' }, - { title: '业务员', width: '100px', index: 'salesmanName', className: 'text-center', }, + { title: '业务员', width: '100px', index: 'salesmanName', className: 'text-center' }, // { title: '录单时间', index: 'recordTime', type: 'date', className: 'text-center', width: '150px' }, //TODO - { title: '装货时间', index: 'loadTime', type: 'date', width: '150px', className: 'text-center', }, - { title: '卸货时间', index: 'unloadTime', type: 'date', width: '150px', className: 'text-center', }, - { title: '订单完成时间', index: 'orderReceivingTime', type: 'date', width: 150, className: 'text-center', }, - { title: '支付完成时间', index: 'overallPaymentTime', type: 'date', width: 150, className: 'text-center', }, + { title: '装货时间', index: 'loadTime', type: 'date', width: '150px', className: 'text-center' }, + { title: '卸货时间', index: 'unloadTime', type: 'date', width: '150px', className: 'text-center' }, + { title: '订单完成时间', index: 'orderReceivingTime', type: 'date', width: 150, className: 'text-center' }, + { title: '支付完成时间', index: 'overallPaymentTime', type: 'date', width: 150, className: 'text-center' }, { title: '开票状态', index: 'sts', render: 'sts', className: 'text-center', width: 120 }, { title: '申请开票时间', index: 'vatappdate', type: 'date', className: 'text-center', width: 180 }, { title: '申请开票编号', index: 'vatappcode', className: 'text-center', width: 190 }, - { title: '分票编号', index: 'vatinvcode', width: '200px', className: 'text-center', }, - { title: '发票号码', index: 'invoiceno', width: 130, className: 'text-center', }, + { title: '分票编号', index: 'vatinvcode', width: '200px', className: 'text-center' }, + { title: '发票号码', index: 'invoiceno', width: 130, className: 'text-center' }, { title: '发票代码', index: 'invoiceno2', width: 130, className: 'text-center' }, { title: '开票日期', index: 'invoicedate', type: 'date', width: 150, className: 'text-center' }, // { title: '作废日期', index: 'invalidTime', type: 'date', width: 150 }, // TODO { - title: 'ETC开票金额', index: 'etcInvoiceMoney', className: 'text-center', width: 120, type: 'widget', + title: 'ETC开票金额', + index: 'etcInvoiceMoney', + className: 'text-center', + width: 120, + type: 'widget', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.etcInvoiceMoney }) } } ]; From db919672e04a7d31fe212e829118fa983cfcd382 Mon Sep 17 00:00:00 2001 From: weiyu Date: Fri, 29 Apr 2022 15:20:21 +0800 Subject: [PATCH 10/17] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bulk-release-publish.component.html | 3 +-- .../order-reporting/order-reporting.component.ts | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html index db754dcf..20624310 100644 --- a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html +++ b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html @@ -13,8 +13,7 @@ -
装卸货信息预计公里数：{{ totalDistance }}km，预计行程耗时：{{ totalTime }}小时
装卸货信息预计公里数：{{ totalDistance }}km，预计行程耗时：{{ totalTime }}小时
diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts index 67b57200..1ff984b0 100644 --- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts +++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts @@ -445,10 +445,10 @@ export class TaxManagementOrderReportingComponent implements OnInit { this.service.msgSrv.warning('选择了已上传，请重新勾选！'); return; } - if(this.selectedRows.find(item => item.checkStatus !== '1')) { - this.service.msgSrv.warning('选择了未通过校验的订单，请重新勾选！'); - return; - } + // if(this.selectedRows.find(item => item.checkStatus !== '1')) { + // this.service.msgSrv.warning('选择了未通过校验的订单，请重新勾选！'); + // return; + // } let params: any[] = []; this.selectedRows.forEach(item => { params.push(item.id); From 0abc792e0f37145b8b944c8cb9f3ffa8c0f2c9ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= Date: Fri, 29 Apr 2022 15:20:22 +0800 Subject: [PATCH 11/17] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=80=BC=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fund-info/fund-info.component.html | 5 +++ .../fund-info/fund-info.component.ts | 2 +- .../verify-result.component.html | 5 +++ .../verify-result/verify-result.component.ts | 2 +- .../order-reporting.component.html | 21 ++++++----- .../verify-result.component.html | 21 +++++------ .../verify-result/verify-result.component.ts | 35 ++++++++++--------- src/app/shared/shared-delon.module.ts | 3 +- 8 files changed, 53 insertions(+), 41 deletions(-) diff --git a/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.html b/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.html index b8bbd698..6cf39a36 100644 --- a/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.html +++ b/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.html @@ -6,6 +6,11 @@ {{filterCheckStatus(item?.checkStatus)}} + + +
{{item?.fieldValue}}
+ +
diff --git a/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.ts b/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.ts index 2e120e63..27937220 100644 --- a/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.ts +++ b/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.ts @@ -55,7 +55,7 @@ export class DatatableReportingFundInfoComponent implements OnInit { 1: '是', }, }, - { title: '上传值', index: 'fieldValue', className: 'text-center', width: '15%', }, + { title: '上传值', render: 'fieldValue', className: 'text-center', width: '15%', }, { title: '本地校验', render: 'checkStatus', diff --git a/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html b/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html index 2ed32290..0a488838 100644 --- a/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html +++ b/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html @@ -12,6 +12,11 @@ {{filterCheckStatus(item?.checkStatus)}} + + +
{{item?.fieldValue}}
+ +
diff --git a/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.ts b/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.ts index 15ef42f2..c3175d39 100644 --- a/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.ts +++ b/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.ts @@ -62,7 +62,7 @@ export class DatatableReportingVerifyResultComponent implements OnInit { 1: '是' } }, - { title: '上传值', index: 'fieldValue', className: 'text-center', width: '150px', }, + { title: '上传值', render: 'fieldValue', className: 'text-center', width: '150px', }, { title: '本地校验', render: 'checkStatus', className: 'text-center', width: '100px', // type: 'enum', diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html index 953a2464..8657dfe0 100644 --- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html +++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html @@ -17,9 +17,10 @@
- + - +
- + diff --git a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts index 3388d7a5..3c579f38 100644 --- a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts +++ b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts @@ -309,6 +309,7 @@ export class PartnerAccountManagementWithdrawalsRecordComponent implements OnIni { text: '查看回单', iif: item => item.refundStatus === '3', + acl: { ability: ['AM-WITHDRAW-RECORD-viewRefund'] }, click: item => this.service.getReceiptUrl(item.receiptUrl, { bankType: item.bankType, @@ -322,15 +323,18 @@ export class PartnerAccountManagementWithdrawalsRecordComponent implements OnIni { text: '查看原因', iif: item => item.refundStatus === '4', + acl: { ability: ['AM-WITHDRAW-RECORD-viewResult'] }, click: item => this.showReason(item) }, { text: '审核', iif: item => item.refundStatus === '1', + acl: { ability: ['AM-WITHDRAW-RECORD-oneAudit'] }, click: item => this.auditAction(item) }, { text: '详情', + acl: { ability: ['AM-WITHDRAW-RECORD-detail'] }, click: item => this.router.navigate(['./../detail/' + item.id], { relativeTo: this.ar }) } ] diff --git a/src/app/routes/partner/partner-routing.module.ts b/src/app/routes/partner/partner-routing.module.ts index 277e01d4..9f21282a 100644 --- a/src/app/routes/partner/partner-routing.module.ts +++ b/src/app/routes/partner/partner-routing.module.ts @@ -82,12 +82,13 @@ const routes: Routes = [ { path: 'rebate', children: [ - { path: 'particulars', component: ParterRebateManageMentParticularsComponent }, - { path: 'record', component: ParterRebateManageMentRecordComponent }, - { path: 'setting', component: ParterRebateManageMentSettingComponent }, + { path: 'particulars', component: ParterRebateManageMentParticularsComponent, data: { guard: { ability: ['REBATE-PARTICULARS-search'] } } }, + { path: 'record', component: ParterRebateManageMentRecordComponent, data: { guard: { ability: ['REBATE-RECORD-search'] } } }, + { path: 'setting', component: ParterRebateManageMentSettingComponent, data: { guard: { ability: ['REBATE-SETTING-search'] } } }, { path: 'setting/add/:id', component: ParterRebateManageMentAddComponent } ] }, + // 账户管理 { path: 'account-management', children: [ @@ -95,16 +96,30 @@ const routes: Routes = [ path: 'am', children: [ { path: '', redirectTo: 'list' }, - { path: 'list', component: PartnerAccountManagementListComponent }, - { path: 'detail/:id', component: PartnerAccountManagementAccountDetailComponent }, - { path: 'recorded/detail/:id', component: PartnerAccountManagementRecordedDetailComponent } + { path: 'list', component: PartnerAccountManagementListComponent, data: { guard: { ability: ['AM-LIST-search'] } } }, + // 合伙人账户明细 + { + path: 'detail/:id', + component: PartnerAccountManagementAccountDetailComponent, + data: { guard: { ability: ['AM-LIST-search'] } } + }, + // 待入账明细 + { + path: 'recorded/detail/:id', + component: PartnerAccountManagementRecordedDetailComponent, + data: { guard: { ability: ['AN-RECORDED-DETAIL-search'] } } + } ] }, { path: 'withdraw-record', children: [ { path: '', redirectTo: 'list' }, - { path: 'list', component: PartnerAccountManagementWithdrawalsRecordComponent }, + { + path: 'list', + component: PartnerAccountManagementWithdrawalsRecordComponent, + data: { guard: { ability: ['AM-WITHDRAW-RECORD-search'] } } + }, { path: 'detail/:id', component: PartnerAccountManagementWithdralDetailComponent } ] } @@ -148,7 +163,7 @@ const routes: Routes = [ { path: 'recorded', children: [ - { path: 'record', component: PartnerRecordedRecordComponent }, + { path: 'record', component: PartnerRecordedRecordComponent, data: { guard: { ability: ['RECORDED-LIST-search'] } } }, { path: 'record/detail/:id', component: PartnerRecordedDetailComponent } ] }, diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts index c0740d72..262e6397 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-03-21 09:26:45 * @LastEditors : Shiming - * @LastEditTime : 2022-04-27 14:14:32 + * @LastEditTime : 2022-04-29 16:23:18 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -143,29 +143,29 @@ export class ParterRebateManageMentAddComponent implements OnInit { }); } save() { - // if(!this.configName) { - // this.service.msgSrv.warning('请输入配置名称！'); - // return - // } - // if(!this.accountingRate) { - // this.service.msgSrv.warning('请输入固定结算费率！'); - // return - // } - // if(!this.partnerType) { - // this.service.msgSrv.warning('请选择合伙人范围！'); - // return - // } - // if(this.partnerType == '3' && this.partnerPeopleList?.length == 0) { - // this.service.msgSrv.warning('请选择合伙人！'); - // return - // } - // let real = false; - // this.table.data.forEach((element: any) => { - // if (element.startAmount > element.endAmount) { - // real = true; - // return; - // } - // }); + if(!this.configName) { + this.service.msgSrv.warning('请输入配置名称！'); + return + } + if(!this.accountingRate) { + this.service.msgSrv.warning('请输入固定结算费率！'); + return + } + if(!this.partnerType) { + this.service.msgSrv.warning('请选择合伙人范围！'); + return + } + if(this.partnerType == '3' && this.partnerPeopleList?.length == 0) { + this.service.msgSrv.warning('请选择合伙人！'); + return + } + let real = false; + this.table.data.forEach((element: any) => { + if (element.startAmount > element.endAmount) { + real = true; + return; + } + }); // if (real) { // this.service.msgSrv.warning('初始业务量不能超过到达业务量！'); // return; @@ -184,12 +184,12 @@ export class ParterRebateManageMentAddComponent implements OnInit { }; console.log(params); - // this.service.request(this.service.$api_save_rebateConfig, params).subscribe((res: any) => { - // if (res) { - // this.service.msgSrv.success('新增成功！'); - // this.router.navigate(['/partner/rebate/setting']); - // } - // }); + this.service.request(this.service.$api_save_rebateConfig, params).subscribe((res: any) => { + if (res) { + this.service.msgSrv.success('新增成功！'); + this.router.navigate(['/partner/rebate/setting']); + } + }); } initData(id: string) { this.service.request(this.service.$api_get_getPartnerRebateConfigInfo, { id: id }).subscribe((res: any) => { diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.html b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.html index b433bc9f..c66f3589 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.html +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.html @@ -23,7 +23,7 @@ >
- +
@@ -34,7 +34,7 @@
- +
this.configAction(_record), }, { text: '禁用', + acl: { ability: ['VEHICLE-LIST-view'] }, iif: (_record) =>{ return _record.stateLocked == true && (_record.partnerType == 3 || _record.partnerType == 2)}, click: _record => this.viewEvaluate(_record), }, { text: '启用', + acl: { ability: ['VEHICLE-LIST-view'] }, iif: (_record) =>{ return _record.stateLocked == false}, click: _record => this.viewEvaluate(_record), }, diff --git a/src/app/routes/partner/recorded/components/record/record.component.html b/src/app/routes/partner/recorded/components/record/record.component.html index ca550d9d..d20b2fcf 100644 --- a/src/app/routes/partner/recorded/components/record/record.component.html +++ b/src/app/routes/partner/recorded/components/record/record.component.html @@ -10,7 +10,7 @@ class="text-right"> - + + diff --git a/src/app/routes/partner/recorded/components/record/record.component.ts b/src/app/routes/partner/recorded/components/record/record.component.ts index 74f14074..33b39d9a 100644 --- a/src/app/routes/partner/recorded/components/record/record.component.ts +++ b/src/app/routes/partner/recorded/components/record/record.component.ts @@ -316,15 +316,18 @@ export class PartnerRecordedRecordComponent implements OnInit { { text: '审核', iif: item => item.sts === '0', + acl: { ability: ['RECORDED-LIST-oneAudit'] }, click: item => this.auditAction(item) }, { text: '复审', iif: item => item.sts === '1', + acl: { ability: ['RECORDED-LIST-recheck'] }, click: item => this.router.navigate(['./detail/' + item.id], { relativeTo: this.ar }) }, { text: '详情', + acl: { ability: ['RECORDED-LIST-detail'] }, click: item => this.router.navigate(['./detail/' + item.id], { relativeTo: this.ar }) } ] From da4d794d9603adc3dd7022f60cf179540292c4c0 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 29 Apr 2022 17:27:57 +0800 Subject: [PATCH 17/17] fix bug --- .../components/list/list.component.html | 2 +- .../components/list/list.component.ts | 2 ++ .../components/list/list.component.html | 2 +- .../banner/components/list/list.component.ts | 3 +++ .../components/list/list.component.html | 2 +- .../components/list/list.component.ts | 3 +++ .../index/partner-list.component.html | 4 ++-- .../index/partner-list.component.ts | 5 +++++ .../routes/partner/partner-routing.module.ts | 21 ++++++++++++------- .../particulars/particulars.component.html | 2 +- .../rebate-record.component.html | 2 +- .../rebate-record/rebate-record.component.ts | 1 + .../rebate-setting.component.html | 4 ++-- .../rebate-setting.component.ts | 6 +++--- .../components/list/list.component.html | 2 +- .../components/list/list.component.ts | 5 +++++ 16 files changed, 46 insertions(+), 20 deletions(-) diff --git a/src/app/routes/partner/channel-sales/components/list/list.component.html b/src/app/routes/partner/channel-sales/components/list/list.component.html index 8b7dd971..1183199e 100644 --- a/src/app/routes/partner/channel-sales/components/list/list.component.html +++ b/src/app/routes/partner/channel-sales/components/list/list.component.html @@ -21,7 +21,7 @@ - + this.edit(_record), }, { text: '冻结', + acl: { ability: ['channelSales-frozen'] }, click: (_record, _modal, _instance) => this.stop(_record), } ] diff --git a/src/app/routes/partner/knowledge/banner/components/list/list.component.html b/src/app/routes/partner/knowledge/banner/components/list/list.component.html index d533734b..f56f199d 100644 --- a/src/app/routes/partner/knowledge/banner/components/list/list.component.html +++ b/src/app/routes/partner/knowledge/banner/components/list/list.component.html @@ -27,7 +27,7 @@
- +
diff --git a/src/app/routes/partner/knowledge/banner/components/list/list.component.ts b/src/app/routes/partner/knowledge/banner/components/list/list.component.ts index aae33fa5..8728b5a8 100644 --- a/src/app/routes/partner/knowledge/banner/components/list/list.component.ts +++ b/src/app/routes/partner/knowledge/banner/components/list/list.component.ts @@ -156,12 +156,14 @@ export class BannerComponentsListComponent implements OnInit { buttons: [ { text: '修改', + acl: { ability: ['banner-change'] }, click: (item) => { this.router.navigate(['../detail'], { queryParams: { id: item.id, type: 'edit' }, relativeTo: this.ar }); } }, { text: '禁用', + acl: { ability: ['banner-forbidden'] }, pop: { title: `确定禁用此banner图吗？？`, okType: 'danger', @@ -174,6 +176,7 @@ export class BannerComponentsListComponent implements OnInit { }, { text: '启用', + acl: { ability: ['banner-startUseing'] }, pop: { title: `确定启用此banner图吗？`, okType: 'danger', diff --git a/src/app/routes/partner/level-config/components/list/list.component.html b/src/app/routes/partner/level-config/components/list/list.component.html index e6f50f99..e422e411 100644 --- a/src/app/routes/partner/level-config/components/list/list.component.html +++ b/src/app/routes/partner/level-config/components/list/list.component.html @@ -11,7 +11,7 @@ - + this.edit(_record) }, { text: '禁用', + acl: { ability: ['LevelConfig-forbidden'] }, click: (_record, _modal, _instance) => this.stop(_record), iif: item => !item.stateLocked }, { text: '启用', + acl: { ability: ['LevelConfig-startUseing'] }, click: (_record, _modal, _instance) => this.restart(_record), iif: item => item.stateLocked } diff --git a/src/app/routes/partner/partner-list/components/index/partner-list.component.html b/src/app/routes/partner/partner-list/components/index/partner-list.component.html index b0388b2c..bce2f3b2 100644 --- a/src/app/routes/partner/partner-list/components/index/partner-list.component.html +++ b/src/app/routes/partner/partner-list/components/index/partner-list.component.html @@ -20,9 +20,9 @@
- + + nzType="primary" acl [acl-ability]="['ENTERPRISE-savePersonally']">新增个人合伙人
item.id && item.approvalStatus === 10, click: item => this.auditPartner(item) }, { text: '详情
', iif: item => item.id, + acl: { ability: ['ENTERPRISE-detail'] }, click: item => { if (item.partnerType === 1) { this.router.navigate([`/partner/partner-list/etp-detail/${item.id}`]); @@ -466,15 +468,18 @@ export class PartnerListComponent { { text: '修改返佣模板', iif: item => item.id, + acl: { ability: ['ENTERPRISE-updateTemplate'] }, click: item => this.editTemplateAction(item) }, { text: '修改渠道销售', iif: item => item.id, + acl: { ability: ['ENTERPRISE-updateChannelCheck'] }, click: item => this.editCannelAction(item) }, { text: '重发CRM流程', + acl: { ability: ['ENTERPRISE-reSendCrm'] }, click: item => item.id && this.reSendCRM(item), iif: item => item.crmStatus === 10 } diff --git a/src/app/routes/partner/partner-routing.module.ts b/src/app/routes/partner/partner-routing.module.ts index 9f21282a..f52f310b 100644 --- a/src/app/routes/partner/partner-routing.module.ts +++ b/src/app/routes/partner/partner-routing.module.ts @@ -66,7 +66,8 @@ const routes: Routes = [ { path: 'channel-sales', children: [ - { path: '', component: ParterChannelSalesListComponent }, + { path: '', component: ParterChannelSalesListComponent, + data: { guard: { ability: ['channelSales-search'] } } }, { path: 'list', component: ParterChannelSalesListComponent }, { path: 'edit', component: ParterChannelSalesEditComponent } ] @@ -74,15 +75,21 @@ const routes: Routes = [ { path: 'level-config', children: [ - { path: '', component: ParterLevelConfigListComponent }, - { path: 'list', component: ParterLevelConfigListComponent }, + { path: '', component: ParterLevelConfigListComponent, + data: { guard: { ability: ['LevelConfig-search'] } } }, + { path: 'list', component: ParterLevelConfigListComponent , + data: { guard: { ability: ['LevelConfig-search'] } } }, { path: 'edit', component: ParterLevelConfigEditComponent } ] }, { path: 'rebate', children: [ - { path: 'particulars', component: ParterRebateManageMentParticularsComponent, data: { guard: { ability: ['REBATE-PARTICULARS-search'] } } }, + { + path: 'particulars', + component: ParterRebateManageMentParticularsComponent, + data: { guard: { ability: ['REBATE-PARTICULARS-search'] } } + }, { path: 'record', component: ParterRebateManageMentRecordComponent, data: { guard: { ability: ['REBATE-RECORD-search'] } } }, { path: 'setting', component: ParterRebateManageMentSettingComponent, data: { guard: { ability: ['REBATE-SETTING-search'] } } }, { path: 'setting/add/:id', component: ParterRebateManageMentAddComponent } @@ -128,7 +135,7 @@ const routes: Routes = [ { path: 'partner-list', children: [ - { path: '', component: PartnerListComponent }, + { path: '', component: PartnerListComponent, data: { guard: { ability: ['ENTERPRISE-search'] } } }, { path: 'etp-detail/:id', component: PartnerDetailComponent }, { path: 'personal-detail/:id', component: PersonalPartnerDetailComponent }, { path: 'add-etp-partner', component: AddEtpPartnerComponent }, @@ -148,7 +155,7 @@ const routes: Routes = [ path: 'scrollimg', children: [ { path: '', component: ScrollImgComponentsListComponent }, - { path: 'list', component: ScrollImgComponentsListComponent }, + { path: 'list', component: ScrollImgComponentsListComponent, data: { guard: { ability: ['scrollimg-search'] } } }, { path: 'detail', component: ScrollimgComponentsAddComponent } ] }, @@ -174,7 +181,7 @@ const routes: Routes = [ { path: 'article-management-list', component: ParterArticleManagementListComponent }, { path: 'article-management-add', component: ParterArticleManagementEditComponent }, { path: 'article-management-edit', component: ParterArticleManagementEditComponent }, - { path: 'banner', component: BannerComponentsListComponent }, + { path: 'banner', component: BannerComponentsListComponent, data: { guard: { ability: ['banner-search'] } } }, { path: 'banner/detail', component: BannerComponentsAddComponent } ] } diff --git a/src/app/routes/partner/rebate-management/components/particulars/particulars.component.html b/src/app/routes/partner/rebate-management/components/particulars/particulars.component.html index 2b4246d2..1bfdebb2 100644 --- a/src/app/routes/partner/rebate-management/components/particulars/particulars.component.html +++ b/src/app/routes/partner/rebate-management/components/particulars/particulars.component.html @@ -32,7 +32,7 @@
- + - +
diff --git a/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.ts b/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.ts index e1d2b4c3..7426e912 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.ts +++ b/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.ts @@ -106,6 +106,7 @@ export class ParterRebateManageMentRecordComponent implements OnInit { buttons: [ { text: '明细', + acl: { ability: ['REBATE-RECORD-detail'] }, click: _record => this.viewEvaluate(_record), } ] diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.html b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.html index c66f3589..c0655917 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.html +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.html @@ -23,7 +23,7 @@ >
- +
@@ -34,7 +34,7 @@
- +
this.configAction(_record), }, { text: '禁用', - acl: { ability: ['VEHICLE-LIST-view'] }, + acl: { ability: ['REBATE-SETTING-forbidden'] }, iif: (_record) =>{ return _record.stateLocked == true && (_record.partnerType == 3 || _record.partnerType == 2)}, click: _record => this.viewEvaluate(_record), }, { text: '启用', - acl: { ability: ['VEHICLE-LIST-view'] }, + acl: { ability: ['REBATE-SETTING-startUseing'] }, iif: (_record) =>{ return _record.stateLocked == false}, click: _record => this.viewEvaluate(_record), }, diff --git a/src/app/routes/partner/scrollimg/components/list/list.component.html b/src/app/routes/partner/scrollimg/components/list/list.component.html index 54ecf965..f19ec73f 100644 --- a/src/app/routes/partner/scrollimg/components/list/list.component.html +++ b/src/app/routes/partner/scrollimg/components/list/list.component.html @@ -27,7 +27,7 @@
- +
diff --git a/src/app/routes/partner/scrollimg/components/list/list.component.ts b/src/app/routes/partner/scrollimg/components/list/list.component.ts index f1b7e90d..df110002 100644 --- a/src/app/routes/partner/scrollimg/components/list/list.component.ts +++ b/src/app/routes/partner/scrollimg/components/list/list.component.ts @@ -176,12 +176,14 @@ export class ScrollImgComponentsListComponent implements OnInit { buttons: [ { text: '修改', + acl: { ability: ['scrollimg-change'] }, click: (item) => { this.router.navigate(['../detail'], { queryParams: { id: item.id, type: 'edit' }, relativeTo: this.ar }); } }, { text: '禁用', + acl: { ability: ['scrollimg-forbidden'] }, pop: { title: `是否确认禁用？`, okType: 'danger', @@ -194,6 +196,7 @@ export class ScrollImgComponentsListComponent implements OnInit { }, { text: '启用', + acl: { ability: ['scrollimg-startUseing'] }, pop: { title: `是否确认启用？`, okType: 'danger', @@ -206,12 +209,14 @@ export class ScrollImgComponentsListComponent implements OnInit { }, { text: '查看', + acl: { ability: ['scrollimg-detail'] }, click: (item) => { this.router.navigate(['../view'], { queryParams: { id: item.id, type: 'view' }, relativeTo: this.ar }); } }, { text: '删除', + acl: { ability: ['scrollimg-delete'] }, pop: { title: `确定删除吗？`, okType: 'danger',