From 8ef9e67941c64e2e9660109e2150d5f5f241f852 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Wed, 23 Feb 2022 14:20:52 +0800 Subject: [PATCH 1/4] edit --- src/app/routes/partner/partner-routing.module.ts | 10 ++++++++++ src/app/routes/partner/partner.module.ts | 11 +++++++++++ src/app/routes/routes-routing.module.ts | 1 + 3 files changed, 22 insertions(+) create mode 100644 src/app/routes/partner/partner-routing.module.ts create mode 100644 src/app/routes/partner/partner.module.ts diff --git a/src/app/routes/partner/partner-routing.module.ts b/src/app/routes/partner/partner-routing.module.ts new file mode 100644 index 00000000..c44d8492 --- /dev/null +++ b/src/app/routes/partner/partner-routing.module.ts @@ -0,0 +1,10 @@ +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; + +const routes: Routes = []; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class PartnerRoutingModule {} diff --git a/src/app/routes/partner/partner.module.ts b/src/app/routes/partner/partner.module.ts new file mode 100644 index 00000000..b902c8f1 --- /dev/null +++ b/src/app/routes/partner/partner.module.ts @@ -0,0 +1,11 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { SharedModule } from '@shared'; +import { PartnerRoutingModule } from './partner-routing.module'; + +const COMPONENTS: any[] = []; +@NgModule({ + declarations: [...COMPONENTS], + imports: [CommonModule, PartnerRoutingModule, SharedModule] +}) +export class PartnerModule {} diff --git a/src/app/routes/routes-routing.module.ts b/src/app/routes/routes-routing.module.ts index 2585caa1..dc6d02c9 100644 --- a/src/app/routes/routes-routing.module.ts +++ b/src/app/routes/routes-routing.module.ts @@ -67,6 +67,7 @@ const routes: Routes = [ loadChildren: () => import('./contract-management/contract-management.module').then(m => m.ContractManagementManagementModule) }, { path: 'menu-management', loadChildren: () => import('./menu-manager/menu-manager.module').then(m => m.MenuManagerModule) }, + { path: 'partner', loadChildren: () => import('./partner/partner.module').then(m => m.PartnerModule) }, { path: 'download', loadChildren: () => import('./download/download.module').then(m => m.DownloadModule) From 85895343f512821c60892875cfbd3679071b692d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= Date: Wed, 23 Feb 2022 15:35:43 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/index/index.component.html | 9 ++++ .../components/index/index.component.spec.ts | 24 ++++++++++ .../components/index/index.component.ts | 45 +++++++++++++++++++ .../routes/partner/partner-routing.module.ts | 6 ++- src/app/routes/partner/partner.module.ts | 6 ++- 5 files changed, 86 insertions(+), 4 deletions(-) create mode 100644 src/app/routes/partner/business-statistics/components/index/index.component.html create mode 100644 src/app/routes/partner/business-statistics/components/index/index.component.spec.ts create mode 100644 src/app/routes/partner/business-statistics/components/index/index.component.ts diff --git a/src/app/routes/partner/business-statistics/components/index/index.component.html b/src/app/routes/partner/business-statistics/components/index/index.component.html new file mode 100644 index 00000000..482ccb06 --- /dev/null +++ b/src/app/routes/partner/business-statistics/components/index/index.component.html @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/app/routes/partner/business-statistics/components/index/index.component.spec.ts b/src/app/routes/partner/business-statistics/components/index/index.component.spec.ts new file mode 100644 index 00000000..d2ca3b79 --- /dev/null +++ b/src/app/routes/partner/business-statistics/components/index/index.component.spec.ts @@ -0,0 +1,24 @@ +import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; +import { PartnerBusinessStatisticsIndexComponent } from './index.component'; + +describe('PartnerBusinessStatisticsIndexComponent', () => { + let component: PartnerBusinessStatisticsIndexComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [PartnerBusinessStatisticsIndexComponent] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(PartnerBusinessStatisticsIndexComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/routes/partner/business-statistics/components/index/index.component.ts b/src/app/routes/partner/business-statistics/components/index/index.component.ts new file mode 100644 index 00000000..1b409e25 --- /dev/null +++ b/src/app/routes/partner/business-statistics/components/index/index.component.ts @@ -0,0 +1,45 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { STColumn, STComponent } from '@delon/abc/st'; +import { SFSchema } from '@delon/form'; +import { ModalHelper, _HttpClient } from '@delon/theme'; + +@Component({ + selector: 'app-partner-business-statistics-index', + templateUrl: './index.component.html', +}) +export class PartnerBusinessStatisticsIndexComponent implements OnInit { + url = `/user`; + searchSchema: SFSchema = { + properties: { + no: { + type: 'string', + title: '编号' + } + } + }; + @ViewChild('st') private readonly st!: STComponent; + columns: STColumn[] = [ + { title: '编号', index: 'no' }, + { title: '调用次数', type: 'number', index: 'callNo' }, + { title: '头像', type: 'img', width: '50px', index: 'avatar' }, + { title: '时间', type: 'date', index: 'updatedAt' }, + { + title: '', + buttons: [ + // { text: '查看', click: (item: any) => `/form/${item.id}` }, + // { text: '编辑', type: 'static', component: FormEditComponent, click: 'reload' }, + ] + } + ]; + + constructor(private http: _HttpClient, private modal: ModalHelper) { } + + ngOnInit(): void { } + + add(): void { + // this.modal + // .createStatic(FormEditComponent, { i: { id: 0 } }) + // .subscribe(() => this.st.reload()); + } + +} diff --git a/src/app/routes/partner/partner-routing.module.ts b/src/app/routes/partner/partner-routing.module.ts index c44d8492..9b76c2c4 100644 --- a/src/app/routes/partner/partner-routing.module.ts +++ b/src/app/routes/partner/partner-routing.module.ts @@ -1,10 +1,12 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; +import { PartnerBusinessStatisticsIndexComponent } from './business-statistics/components/index/index.component'; -const routes: Routes = []; +const routes: Routes = [ + { path: 'index', component: PartnerBusinessStatisticsIndexComponent }]; @NgModule({ imports: [RouterModule.forChild(routes)], exports: [RouterModule] }) -export class PartnerRoutingModule {} +export class PartnerRoutingModule { } diff --git a/src/app/routes/partner/partner.module.ts b/src/app/routes/partner/partner.module.ts index b902c8f1..c1198f85 100644 --- a/src/app/routes/partner/partner.module.ts +++ b/src/app/routes/partner/partner.module.ts @@ -2,10 +2,12 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { SharedModule } from '@shared'; import { PartnerRoutingModule } from './partner-routing.module'; +import { PartnerBusinessStatisticsIndexComponent } from './business-statistics/components/index/index.component'; -const COMPONENTS: any[] = []; +const COMPONENTS: any[] = [ + PartnerBusinessStatisticsIndexComponent]; @NgModule({ declarations: [...COMPONENTS], imports: [CommonModule, PartnerRoutingModule, SharedModule] }) -export class PartnerModule {} +export class PartnerModule { } From c8e2c088ea32eefbc3b248dfe14512727dd97d0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= Date: Wed, 23 Feb 2022 15:42:26 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/mocks/platform/tms-obc-web.json | 1025 ++++++++++---------- 1 file changed, 508 insertions(+), 517 deletions(-) diff --git a/src/assets/mocks/platform/tms-obc-web.json b/src/assets/mocks/platform/tms-obc-web.json index ff23805c..fe5c09e3 100644 --- a/src/assets/mocks/platform/tms-obc-web.json +++ b/src/assets/mocks/platform/tms-obc-web.json @@ -1,518 +1,509 @@ { - "menu": [ - { - "text": "主导航", - "hideInBreadcrumb": true, - "children": [ - { - "text": "用户中心", - "icon": "anticon anticon-dashboard", - "group": true, - "children": [ - { - "text": "货主管理", - "icon": "anticon anticon-dashboard", - "children": [ - { - "text": "企业列表", - "icon": "anticon anticon-dashboard", - "link": "/usercenter/freight/list" - }, - { - "text": "道运证", - "hide": true, - "icon": "anticon anticon-dashboard", - "link": "/usercenter/freight/list/view/:id" - }, - { - "text": "货主详情", - "hide": true, - "icon": "anticon anticon-dashboard", - "link": "/usercenter/freight/list/detail/:id" - }, - { - "text": "企业认证", - "hide": true, - "icon": "anticon anticon-dashboard", - "link": "/usercenter/freight/new" - }, - { - "text": "企业审核列表", - "icon": "anticon anticon-dashboard", - "link": "/usercenter/freight/enterprise" - }, - { - "text": "企业审核列表详情", - "hide": true, - "icon": "anticon anticon-dashboard", - "link": "/usercenter/freight/enterprise/view/:id" - }, - { - "text": "货主员工列表", - "icon": "anticon anticon-dashboard", - "link": "/usercenter/freight/user" - }, - { - "text": "货主员工详情", - "icon": "anticon anticon-dashboard", - "link": "/usercenter/freight/user/view/:id" - } - ] - }, - { - "text": "司机管理", - "icon": "anticon anticon-dashboard", - "link": "/demo/zorro", - "children": [ - { - "text": "司机列表", - "icon": "anticon anticon-dashboard", - "link": "/usercenter/driver" - }, - { - "text": "司机详情", - "hide": true, - "icon": "anticon anticon-dashboard", - "link": "/usercenter/driver/detail/:id" - }, - { - "text": "车队长列表", - "icon": "anticon anticon-dashboard", - "link": "/usercenter/driver/captain" - } - ] - } - ] - }, - { - "text": "运力管理", - "icon": "anticon anticon-dashboard", - "group": true, - "children": [ - { - "text": "车辆列表", - "link": "/vehicle/list" - }, - { - "hide": true, - "text": "车辆列表详情", - "link": "/vehicle/list/detail/:id" - }, - { - "text": "车辆审核列表", - "link": "/vehicle/audit" - }, - { - "hide": true, - "text": "车辆审核列表详情", - "link": "/vehicle/audit/detail/:id" - } - ] - }, - { - "text": "货源管理", - "icon": "anticon anticon-dashboard", - "group": true, - "children": [ - { - "text": "货源管理", - "icon": "anticon anticon-dashboard", - "link": "/supply-management/index", - "reuse": true - }, - { - "text": "货源详情", - "icon": "anticon anticon-dashboard", - "link": "/supply-management/bulk-detail", - "hide": true - }, - { - "text": "修改货源", - "icon": "anticon anticon-dashboard", - "link": "/supply-management/vehicle-amend/:id", - "hide": true - }, - { - "text": "货源详情", - "icon": "anticon anticon-dashboard", - "link": "/supply-management/vehicle-detail/:id", - "hide": true - } - ] - }, - { - "text": "订单管理", - "icon": "anticon anticon-dashboard", - "group": true, - "children": [ - { - "text": "整车订单", - "icon": "anticon anticon-dashboard", - "link": "/order-management/vehicle" - }, - { - "text": "大宗订单", - "icon": "anticon anticon-dashboard", - "link": "/order-management/bulk" - }, - { - "text": "风险单管理", - "icon": "anticon anticon-dashboard", - "link": "/order-management/risk" - }, - { - "text": "投诉管理", - "icon": "anticon anticon-dashboard", - "link": "/order-management/complaint" - }, - { - "text": "整车订单详情", - "icon": "anticon anticon-dashboard", - "link": "/order-management/vehicle-detail/:id", - "hide": true - }, - { - "text": "单据审核", - "icon": "anticon anticon-dashboard", - "link": "/order-management/receipts-audit" - }, - { - "text": "大宗订单详情", - "icon": "anticon anticon-dashboard", - "link": "/order-management/bulk-detail/:id", - "hide": true - } - ] - }, - { - "text": "运单管理", - "icon": "anticon anticon-dashboard", - "group": true, - "children": [ - { - "text": "整车运单", - "link": "/waybill-management/vehicle" - }, - { - "hide": true, - "text": "整车运单详情", - "link": "/waybill-management/vehicle-detail/:id" - }, - { - "text": "大宗运单", - "link": "/waybill-management/bulk" - }, - { - "hide": true, - "text": "大宗运单详情", - "link": "/waybill-management/bulk-detail/:id" - }, - { - "text": "异常上报", - "link": "/waybill-management/abnormal-appear" - } - ] - }, - { - "text": "财务管理", - "icon": "anticon anticon-dashboard", - "group": true, - "children": [ - { - "text": "费用管理", - "link": "/financial-management/cost-management" - }, - { - "text": "费用浏览", - "hide": true, - "link": "/financial-management/cost-management/detail/:id" - }, - { - "text": "凭证管理", - "link": "/financial-management/voucher-management" - }, - { - "text": "凭证汇总", - "link": "/financial-management/voucher-summary" - }, - { - "text": "应收费用单", - "hide": true, - "link": "/financial-management/cost-management/expenses-receivable/:id" - }, - { - "text": "应付费用单", - "hide": true, - "link": "/financial-management/cost-management/expenses-payable/:id" - }, - { - "text": "付款单", - "link": "/financial-management/payment-order" - }, - { - "text": "收款单", - "link": "/financial-management/receipt-order" - }, - { - "text": "应收核销", - "link": "/financial-management/receivable-order" - }, - { - "text": "应收核销详情", - "hide": true, - "link": "/financial-management/receivable-order/detail/:id" - }, - { - "text": "应付核销", - "link": "/financial-management/payable-order" - }, - { - "text": "应收核销详情", - "hide": true, - "link": "/financial-management/payable-order/detail/:id" - }, - { - "text": "货主账户", - "link": "/financial-management/freight-account" - }, - { - "text": "货主账户详情", - "hide": true, - "link": "/financial-management/freight-account/detail/:id" - }, - { - "text": "司机账户", - "link": "/financial-management/driver-account" - }, - { - "text": "司机账户详情", - "hide": true, - "link": "/financial-management/driver-account/detail/:id" - }, - { - "text": "充值记录", - "link": "/financial-management/recharge-record" - }, - { - "text": "提现记录", - "link": "/financial-management/withdrawals-record" - }, - { - "text": "提现详情", - "hide": true, - "link": "/financial-management/withdrawals-record/detail/:id" - }, - { - "text": "异常入金", - "link": "/financial-management/abnormal-gold" - }, - { - "text": "支付记录", - "link": "/financial-management/payment-record" - }, - { - "text": "交易流水", - "link": "/financial-management/transaction-flow" - } - ] - }, - { - "text": "票务管理", - "icon": "anticon anticon-dashboard", - "group": true, - "children": [ - { - "text": "销项发票", - "children": [ - { - "text": "开票申请", - "link": "/ticket/invoice-requested" - }, - { - "text": "开票订单明细", - "link": "/ticket/invoice-requested/detail/:id", - "hide": true - }, - { - "text": "销票处理", - "link": "/ticket/cancellation-invoice" - }, - { - "text": "销票订单明细", - "link": "/ticket/cancellation-invoice/detail/:id", - "hide": true - }, - { - "text": "已开发票", - "link": "/ticket/invoice-list" - }, - { - "text": "已开订单明细", - "link": "/ticket/invoice-list/detail/:id", - "hide": true - }, - { - "text": "快递信息", - "link": "/ticket/express-info" - } - ] - }, - { - "text": "ETC发票", - "children": [ - { - "text": "申请发票", - "link": "/ticket/etc-invoice-requested" - }, - { - "text": "开票记录", - "link": "/ticket/etc-invoice-list" - }, - { - "text": "已开发票", - "link": "/ticket/etc-invoiced-logs" - }, - { - "text": "ETC白名单", - "link": "/ticket/etc-blacklist" - } - ] - }, - { - "text": "进项发票", - "link": "/ticket/input-invoice" - }, - { - "text": "修改收票信息", - "link": "/ticket/input-invoice/detail/:id", - "hide": true - }, - { - "text": "进项发票", - "link": "/ticket/input-invoice/edit/:id", - "hide": true - } - ] - }, - { - "text": "合同管理", - "icon": "anticon anticon-dashboard", - "group": true, - "children": [ - { - "text": "保单管理", - "link": "/contract-management/policy" - }, - { - "text": "合同管理", - "link": "/contract-management/index" - }, - { - "text": "合同模板", - "link": "/contract-management/template" - } - ] - }, - { - "text": "系统设置", - "icon": "anticon anticon-dashboard", - "group": true, - "children": [ - { - "text": "员工管理", - "group": true, - "children": [ - { - "text": "员工管理", - "link": "/system/staff-management" - }, - { - "text": "角色管理", - "link": "/system/role-management" - } - ] - }, - { - "text": "操作日志", - "group": true, - "children": [ - { - "text": "系统操作日志", - "link": "/logs/system-logs" - }, - { - "text": "货源操作日志", - "link": "/logs/system-supply-logs" - }, - { - "text": "订单操作日志", - "link": "/logs/system-waybill-logs" - }, - { - "text": "用户登录日志", - "link": "/logs/user-logs" - }, - { - "text": "版本发布记录", - "link": "/logs/version-logs" - } - ] - }, - { - "text": "CRM客户管理", - "link": "/system/crm-management" - }, - { - "text": "结算客户管理", - "link": "/system/close-account" - }, - { - "text": "网络货运人", - "link": "/system/network-freight" - }, - { - "text": "基础设置", - "link": "/system/basic-setting" - }, - { - "text": "公告信息管理", - "link": "/system/announcement-message" - }, - { - "text": "车型车长配置", - "link": "/system/cart-config" - }, - { - "text": "基础配置", - "link": "/system/basic-config" - }, - { - "text": "协议配置", - "link": "/system/agreement-config" - }, - { - "text": "审核驳回理由配置", - "link": "/system/audit-reason-config" - }, - { - "text": "菜单管理", - "link": "/menu-management/index" - }, - { - "text": "接口权限", - "link": "/menu-management/auth" - }, - { - "text": "系统配置", - "link": "/system/system-config" - }, - { - "text": "货物名称配置", - "link": "/system/goods-name-config" - } - ] - } - ] - } - ] -} \ No newline at end of file + "menu": [{ + "text": "主导航", + "hideInBreadcrumb": true, + "children": [{ + "text": "用户中心", + "icon": "anticon anticon-dashboard", + "group": true, + "children": [{ + "text": "货主管理", + "icon": "anticon anticon-dashboard", + "children": [{ + "text": "企业列表", + "icon": "anticon anticon-dashboard", + "link": "/usercenter/freight/list" + }, + { + "text": "道运证", + "hide": true, + "icon": "anticon anticon-dashboard", + "link": "/usercenter/freight/list/view/:id" + }, + { + "text": "货主详情", + "hide": true, + "icon": "anticon anticon-dashboard", + "link": "/usercenter/freight/list/detail/:id" + }, + { + "text": "企业认证", + "hide": true, + "icon": "anticon anticon-dashboard", + "link": "/usercenter/freight/new" + }, + { + "text": "企业审核列表", + "icon": "anticon anticon-dashboard", + "link": "/usercenter/freight/enterprise" + }, + { + "text": "企业审核列表详情", + "hide": true, + "icon": "anticon anticon-dashboard", + "link": "/usercenter/freight/enterprise/view/:id" + }, + { + "text": "货主员工列表", + "icon": "anticon anticon-dashboard", + "link": "/usercenter/freight/user" + }, + { + "text": "货主员工详情", + "icon": "anticon anticon-dashboard", + "link": "/usercenter/freight/user/view/:id" + } + ] + }, + { + "text": "司机管理", + "icon": "anticon anticon-dashboard", + "link": "/demo/zorro", + "children": [{ + "text": "司机列表", + "icon": "anticon anticon-dashboard", + "link": "/usercenter/driver" + }, + { + "text": "司机详情", + "hide": true, + "icon": "anticon anticon-dashboard", + "link": "/usercenter/driver/detail/:id" + }, + { + "text": "车队长列表", + "icon": "anticon anticon-dashboard", + "link": "/usercenter/driver/captain" + } + ] + } + ] + }, + { + "text": "运力管理", + "icon": "anticon anticon-dashboard", + "group": true, + "children": [{ + "text": "车辆列表", + "link": "/vehicle/list" + }, + { + "hide": true, + "text": "车辆列表详情", + "link": "/vehicle/list/detail/:id" + }, + { + "text": "车辆审核列表", + "link": "/vehicle/audit" + }, + { + "hide": true, + "text": "车辆审核列表详情", + "link": "/vehicle/audit/detail/:id" + } + ] + }, + { + "text": "货源管理", + "icon": "anticon anticon-dashboard", + "group": true, + "children": [{ + "text": "货源管理", + "icon": "anticon anticon-dashboard", + "link": "/supply-management/index", + "reuse": true + }, + { + "text": "货源详情", + "icon": "anticon anticon-dashboard", + "link": "/supply-management/bulk-detail", + "hide": true + }, + { + "text": "修改货源", + "icon": "anticon anticon-dashboard", + "link": "/supply-management/vehicle-amend/:id", + "hide": true + }, + { + "text": "货源详情", + "icon": "anticon anticon-dashboard", + "link": "/supply-management/vehicle-detail/:id", + "hide": true + } + ] + }, + { + "text": "订单管理", + "icon": "anticon anticon-dashboard", + "group": true, + "children": [{ + "text": "整车订单", + "icon": "anticon anticon-dashboard", + "link": "/order-management/vehicle" + }, + { + "text": "大宗订单", + "icon": "anticon anticon-dashboard", + "link": "/order-management/bulk" + }, + { + "text": "风险单管理", + "icon": "anticon anticon-dashboard", + "link": "/order-management/risk" + }, + { + "text": "投诉管理", + "icon": "anticon anticon-dashboard", + "link": "/order-management/complaint" + }, + { + "text": "整车订单详情", + "icon": "anticon anticon-dashboard", + "link": "/order-management/vehicle-detail/:id", + "hide": true + }, + { + "text": "单据审核", + "icon": "anticon anticon-dashboard", + "link": "/order-management/receipts-audit" + }, + { + "text": "大宗订单详情", + "icon": "anticon anticon-dashboard", + "link": "/order-management/bulk-detail/:id", + "hide": true + } + ] + }, + { + "text": "运单管理", + "icon": "anticon anticon-dashboard", + "group": true, + "children": [{ + "text": "整车运单", + "link": "/waybill-management/vehicle" + }, + { + "hide": true, + "text": "整车运单详情", + "link": "/waybill-management/vehicle-detail/:id" + }, + { + "text": "大宗运单", + "link": "/waybill-management/bulk" + }, + { + "hide": true, + "text": "大宗运单详情", + "link": "/waybill-management/bulk-detail/:id" + }, + { + "text": "异常上报", + "link": "/waybill-management/abnormal-appear" + } + ] + }, + { + "text": "财务管理", + "icon": "anticon anticon-dashboard", + "group": true, + "children": [{ + "text": "费用管理", + "link": "/financial-management/cost-management" + }, + { + "text": "费用浏览", + "hide": true, + "link": "/financial-management/cost-management/detail/:id" + }, + { + "text": "凭证管理", + "link": "/financial-management/voucher-management" + }, + { + "text": "凭证汇总", + "link": "/financial-management/voucher-summary" + }, + { + "text": "应收费用单", + "hide": true, + "link": "/financial-management/cost-management/expenses-receivable/:id" + }, + { + "text": "应付费用单", + "hide": true, + "link": "/financial-management/cost-management/expenses-payable/:id" + }, + { + "text": "付款单", + "link": "/financial-management/payment-order" + }, + { + "text": "收款单", + "link": "/financial-management/receipt-order" + }, + { + "text": "应收核销", + "link": "/financial-management/receivable-order" + }, + { + "text": "应收核销详情", + "hide": true, + "link": "/financial-management/receivable-order/detail/:id" + }, + { + "text": "应付核销", + "link": "/financial-management/payable-order" + }, + { + "text": "应收核销详情", + "hide": true, + "link": "/financial-management/payable-order/detail/:id" + }, + { + "text": "货主账户", + "link": "/financial-management/freight-account" + }, + { + "text": "货主账户详情", + "hide": true, + "link": "/financial-management/freight-account/detail/:id" + }, + { + "text": "司机账户", + "link": "/financial-management/driver-account" + }, + { + "text": "司机账户详情", + "hide": true, + "link": "/financial-management/driver-account/detail/:id" + }, + { + "text": "充值记录", + "link": "/financial-management/recharge-record" + }, + { + "text": "提现记录", + "link": "/financial-management/withdrawals-record" + }, + { + "text": "提现详情", + "hide": true, + "link": "/financial-management/withdrawals-record/detail/:id" + }, + { + "text": "异常入金", + "link": "/financial-management/abnormal-gold" + }, + { + "text": "支付记录", + "link": "/financial-management/payment-record" + }, + { + "text": "交易流水", + "link": "/financial-management/transaction-flow" + } + ] + }, + { + "text": "票务管理", + "icon": "anticon anticon-dashboard", + "group": true, + "children": [{ + "text": "销项发票", + "children": [{ + "text": "开票申请", + "link": "/ticket/invoice-requested" + }, + { + "text": "开票订单明细", + "link": "/ticket/invoice-requested/detail/:id", + "hide": true + }, + { + "text": "销票处理", + "link": "/ticket/cancellation-invoice" + }, + { + "text": "销票订单明细", + "link": "/ticket/cancellation-invoice/detail/:id", + "hide": true + }, + { + "text": "已开发票", + "link": "/ticket/invoice-list" + }, + { + "text": "已开订单明细", + "link": "/ticket/invoice-list/detail/:id", + "hide": true + }, + { + "text": "快递信息", + "link": "/ticket/express-info" + } + ] + }, + { + "text": "ETC发票", + "children": [{ + "text": "申请发票", + "link": "/ticket/etc-invoice-requested" + }, + { + "text": "开票记录", + "link": "/ticket/etc-invoice-list" + }, + { + "text": "已开发票", + "link": "/ticket/etc-invoiced-logs" + }, + { + "text": "ETC白名单", + "link": "/ticket/etc-blacklist" + } + ] + }, + { + "text": "进项发票", + "link": "/ticket/input-invoice" + }, + { + "text": "修改收票信息", + "link": "/ticket/input-invoice/detail/:id", + "hide": true + }, + { + "text": "进项发票", + "link": "/ticket/input-invoice/edit/:id", + "hide": true + } + ] + }, + { + "text": "合同管理", + "icon": "anticon anticon-dashboard", + "group": true, + "children": [{ + "text": "保单管理", + "link": "/contract-management/policy" + }, + { + "text": "合同管理", + "link": "/contract-management/index" + }, + { + "text": "合同模板", + "link": "/contract-management/template" + } + ] + }, + { + "text": "系统设置", + "icon": "anticon anticon-dashboard", + "group": true, + "children": [{ + "text": "员工管理", + "group": true, + "children": [{ + "text": "员工管理", + "link": "/system/staff-management" + }, + { + "text": "角色管理", + "link": "/system/role-management" + } + ] + }, + { + "text": "操作日志", + "group": true, + "children": [{ + "text": "系统操作日志", + "link": "/logs/system-logs" + }, + { + "text": "货源操作日志", + "link": "/logs/system-supply-logs" + }, + { + "text": "订单操作日志", + "link": "/logs/system-waybill-logs" + }, + { + "text": "用户登录日志", + "link": "/logs/user-logs" + }, + { + "text": "版本发布记录", + "link": "/logs/version-logs" + } + ] + }, + { + "text": "CRM客户管理", + "link": "/system/crm-management" + }, + { + "text": "结算客户管理", + "link": "/system/close-account" + }, + { + "text": "网络货运人", + "link": "/system/network-freight" + }, + { + "text": "基础设置", + "link": "/system/basic-setting" + }, + { + "text": "公告信息管理", + "link": "/system/announcement-message" + }, + { + "text": "车型车长配置", + "link": "/system/cart-config" + }, + { + "text": "基础配置", + "link": "/system/basic-config" + }, + { + "text": "协议配置", + "link": "/system/agreement-config" + }, + { + "text": "审核驳回理由配置", + "link": "/system/audit-reason-config" + }, + { + "text": "菜单管理", + "link": "/menu-management/index" + }, + { + "text": "接口权限", + "link": "/menu-management/auth" + }, + { + "text": "系统配置", + "link": "/system/system-config" + }, + { + "text": "货物名称配置", + "link": "/system/goods-name-config" + } + ] + }, + { + "text": "合伙人管理", + "icon": "anticon anticon-dashboard", + "group": true, + "children": [{ + "text": "业务统计", + "link": "parnter/business-statistics/index" + }] + } + ] + }] +} From 5832cc4fbac54e5b5742aeeb7ac5e081cd7f502e Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 23 Feb 2022 16:20:39 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contract-frame.component.html | 21 +- .../contract-list.component.html | 2 +- .../contract-list/contract-list.component.ts | 19 -- .../contract-template-detail.component.ts | 4 - .../contract-template.component.html | 60 +++-- .../contract-template.component.ts | 2 + .../components/policy/policy.component.html | 12 +- .../components/policy/policy.component.ts | 10 +- .../services/contract-management.service.ts | 35 ++- .../components/list/list.component.html | 8 +- .../components/list/list.component.ts | 9 +- .../complaint/complaint.component.html | 4 +- .../complaint/complaint.component.ts | 1 + .../compliance-audit.component.html | 234 ++++++++++-------- .../compliance-audit.component.ts | 6 +- .../modify-rate/modify-rate.component.ts | 4 +- .../components/list/list.component.html | 2 +- .../abnormal-appear.component.html | 4 +- .../bulk-detail/bulk-detail.component.html | 4 +- .../components/bulk/bulk.component.html | 6 +- .../components/bulk/bulk.component.ts | 2 + .../vehicle-detail.component.html | 4 +- .../components/vehicle/vehicle.component.html | 6 +- .../components/vehicle/vehicle.component.ts | 6 +- .../insurance-table.component.ts | 3 - 25 files changed, 253 insertions(+), 215 deletions(-) diff --git a/src/app/routes/contract-management/components/contract-frame/contract-frame.component.html b/src/app/routes/contract-management/components/contract-frame/contract-frame.component.html index 46be1da2..14be2c5c 100644 --- a/src/app/routes/contract-management/components/contract-frame/contract-frame.component.html +++ b/src/app/routes/contract-management/components/contract-frame/contract-frame.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-07 13:29:57 * @LastEditors : Shiming - * @LastEditTime : 2022-01-18 17:16:04 + * @LastEditTime : 2022-02-23 16:04:18 * @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\contract-frame\\contract-frame.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -36,7 +36,16 @@
- +
+ (click)="st?.load(1)" acl [acl-ability]="['CONTRACT-INDEX-searchDetail']">查询 - + +
- +
- +
-
+ diff --git a/src/app/routes/contract-management/components/contract-template/contract-template.component.ts b/src/app/routes/contract-management/components/contract-template/contract-template.component.ts index e1a34797..3a28c9f8 100644 --- a/src/app/routes/contract-management/components/contract-template/contract-template.component.ts +++ b/src/app/routes/contract-management/components/contract-template/contract-template.component.ts @@ -125,10 +125,12 @@ export class ContractManagementTemplateComponent implements OnInit { { text: '编辑', click: (_record) => this.edit(_record), + acl: { ability: ['CONTRACT-TEMPLATE-edit'] }, }, { text: '删除', click: (_record) => this.delete(_record), + acl: { ability: ['CONTRACT-TEMPLATE-delete'] }, }, ], }, diff --git a/src/app/routes/contract-management/components/policy/policy.component.html b/src/app/routes/contract-management/components/policy/policy.component.html index 266fd620..d54bd837 100644 --- a/src/app/routes/contract-management/components/policy/policy.component.html +++ b/src/app/routes/contract-management/components/policy/policy.component.html @@ -1,3 +1,13 @@ + @@ -24,7 +34,7 @@
- +
- - + + +
diff --git a/src/app/routes/insurance-management/components/list/list.component.ts b/src/app/routes/insurance-management/components/list/list.component.ts index ea716bf9..7cc54aaa 100644 --- a/src/app/routes/insurance-management/components/list/list.component.ts +++ b/src/app/routes/insurance-management/components/list/list.component.ts @@ -460,19 +460,22 @@ export class insuranceManagementListComponent implements OnInit { buttons: [ { text: '再次投保', - click: _record => this.retreatNext(_record) + click: _record => this.retreatNext(_record), + // acl: { ability: ['VEHICLE-LIST-view'] }, // iif: item => // item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '1' }, { text: '查看保单', - click: _record => this.showImg(_record) + click: _record => this.showImg(_record), + // acl: { ability: ['VEHICLE-LIST-view'] }, // iif: item => // item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '1' }, { text: '退保费', - click: _record => this.retreatPrice(_record) + click: _record => this.retreatPrice(_record), + // acl: { ability: ['VEHICLE-LIST-view'] }, } ] } diff --git a/src/app/routes/order-management/components/complaint/complaint.component.html b/src/app/routes/order-management/components/complaint/complaint.component.html index ff10dcde..e4563026 100644 --- a/src/app/routes/order-management/components/complaint/complaint.component.html +++ b/src/app/routes/order-management/components/complaint/complaint.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-01-18 17:18:42 + * @LastEditTime : 2022-02-23 15:27:52 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\complaint\\complaint.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -27,7 +27,7 @@
+ (click)="st?.load(1)" acl [acl-ability]="['ORDER-COMPLAINT-search']">查询 diff --git a/src/app/routes/order-management/components/complaint/complaint.component.ts b/src/app/routes/order-management/components/complaint/complaint.component.ts index edf11ab5..7f743dd1 100644 --- a/src/app/routes/order-management/components/complaint/complaint.component.ts +++ b/src/app/routes/order-management/components/complaint/complaint.component.ts @@ -187,6 +187,7 @@ export class OrderManagementComplaintComponent implements OnInit { { text: '查看', click: (_record) => this.view(_record), + acl: { ability: ['ORDER-COMPLAINT-view'] }, }, ], }, diff --git a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html index d958b017..4430599b 100644 --- a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html +++ b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html @@ -4,19 +4,26 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-01-25 14:02:24 + * @LastEditTime : 2022-02-23 15:36:48 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\compliance-audit\\compliance-audit.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> - - +
- +
@@ -25,10 +32,18 @@
- - + + +
- - + - - + @@ -125,23 +138,22 @@ - + - - {{ index + 1 }} - - + #stFloat + multiSort + size="small" + [bordered]="true" + [data]="service.$api_get_listChangeApply" + [columns]="columnsFloat" + [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: changeParams }" + [res]="{ reName: { list: 'data', total: 'data.total' } }" + > + + {{ index + 1 }} + + @@ -149,33 +161,35 @@ - + - - {{ item.amountBeforeChange | currency}} - - - ￥{{ item.amountchangeValue | number: '0.2-2'}} - - - {{ item.amountAfterChange | currency}} - - -
变更原因：{{ViewCause?.changeCause}}
-
拒绝原因：{{ViewCause?.refuseCause}}
-
注：附加费依据调整后的运输费用重新计算
+ #stFloatView + size="small" + [bordered]="true" + [data]="service.$api_getChangeRecordWholeDetail" + [columns]="columnsFloatView" + [req]="{ method: 'POST', allInBody: true, params: changeViewParams }" + [res]="{ reName: { list: 'data.list', total: 'data.total' } }" + > + + {{ item.amountBeforeChange | currency }} + + ￥{{ item.amountchangeValue | number: '0.2-2' }} + + {{ item.amountAfterChange | currency }} + + +
变更原因：{{ ViewCause?.changeCause }}
+
拒绝原因：{{ ViewCause?.refuseCause }}
+
注：附加费依据调整后的运输费用重新计算
 - \ No newline at end of file + diff --git a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts index df351650..d6e0fa51 100644 --- a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts +++ b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts @@ -398,12 +398,14 @@ export class OrderManagementComplianceAuditComponent implements OnInit { { text: '运费变更记录', click: _record => this.OpenPrice(_record), - // iif: item => item.billStatus == '4' + // iif: item => item.billStatus == '4', + acl: { ability: ['ORDER-COMPLIANCE-AUDIT-listChangeApply'] }, }, { text: '合规抽查　　', click: _record => this.audit(_record), - iif: item => item.complianceStatus == '0' + iif: item => item.complianceStatus == '0', + acl: { ability: ['ORDER-COMPLIANCE-AUDIT-updateBillByCompliance'] }, }, ] } diff --git a/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts b/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts index 3b8c81a2..87a1a092 100644 --- a/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts +++ b/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-29 14:51:07 * @LastEditors : Shiming - * @LastEditTime : 2022-01-18 17:23:46 + * @LastEditTime : 2022-02-23 16:19:27 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\modify-rate\\modify-rate.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -42,6 +42,8 @@ export class VehicleModifyRateComponent implements OnInit { additionalRate: { type: 'number', title: '附加费率', + maximum: 100, + minimum: 0, ui: { unit: '%', widgetWidth: 200, diff --git a/src/app/routes/vehicle/components/list/list.component.html b/src/app/routes/vehicle/components/list/list.component.html index 7e3b450d..be3fb947 100644 --- a/src/app/routes/vehicle/components/list/list.component.html +++ b/src/app/routes/vehicle/components/list/list.component.html @@ -24,7 +24,7 @@ [nzLoading]="service.http.loading" (click)="st?.load(1)" >查询 - diff --git a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html index 2bb0d079..b17e0699 100644 --- a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html +++ b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html @@ -1,7 +1,7 @@