diff --git a/package.json b/package.json index 2b60058a..1439c62d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tms-obc-web", - "version": "1.0.1", + "version": "1.2.0", "description": "运营后台-WEB", "author": "cipchk ", "repository": { diff --git a/src/app/routes/financial-management/components/payable-order/payable-order.component.ts b/src/app/routes/financial-management/components/payable-order/payable-order.component.ts index f5fac6ee..860a4753 100644 --- a/src/app/routes/financial-management/components/payable-order/payable-order.component.ts +++ b/src/app/routes/financial-management/components/payable-order/payable-order.component.ts @@ -273,6 +273,7 @@ export class PayableOrderComponent implements OnInit { buttons: [ { text: '浏览', + acl: { ability: ['FINANCIAL-PAYABLE-view'] }, click: item => this.router.navigate(['/financial-management/payable-order/detail/' + item.id], { queryParams: { billHId: item.id } }) } diff --git a/src/app/routes/financial-management/components/payment-order/payment-order.component.html b/src/app/routes/financial-management/components/payment-order/payment-order.component.html index 2dad7899..f9ee3d69 100644 --- a/src/app/routes/financial-management/components/payment-order/payment-order.component.html +++ b/src/app/routes/financial-management/components/payment-order/payment-order.component.html @@ -33,7 +33,7 @@
+ [acl-ability]="['FINANCIAL-PAYMENT-ORDER-list']">筛选
diff --git a/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts b/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts index 63a2ec0b..151c7e56 100644 --- a/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts +++ b/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts @@ -251,6 +251,7 @@ export class ReceiptOrderComponent extends BasicTableComponent implements OnInit buttons: [ { text: '浏览', + acl: { ability: ['FINANCIAL-RECEIPT-view'] }, click: item => this.router.navigate(['/financial-management/receipt-order/detail/' + item.id]) } // { diff --git a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.html b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.html index d0ed4c80..8f33ae3e 100644 --- a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.html +++ b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.html @@ -40,7 +40,8 @@
- +
', + acl: { ability: ['FINANCIAL-RECHARGE-receiptApply'] }, click: item => this.service.getReceiptUrl(item.receiptUrl, { bankType: item.bankType, @@ -207,6 +208,7 @@ export class RechargeRecordComponent extends BasicTableComponent implements OnIn }, { text: '添加备注', + acl: { ability: ['FINANCIAL-RECHARGE-addRemark'] }, click: item => this.addRemark(item) } ] diff --git a/src/app/routes/financial-management/financial-managemen-routing.module.ts b/src/app/routes/financial-management/financial-managemen-routing.module.ts index aa5ba856..f82dc133 100644 --- a/src/app/routes/financial-management/financial-managemen-routing.module.ts +++ b/src/app/routes/financial-management/financial-managemen-routing.module.ts @@ -50,7 +50,7 @@ const routes: Routes = [ component: PlatformAccountDetailComponent, data: { guard: { ability: ['FINANCIAL-PLATFORM-DETAIL-detail'] } } }, - { path: 'recharge-record', component: RechargeRecordComponent }, + { path: 'recharge-record', component: RechargeRecordComponent, data: { guard: { ability: ['FINANCIAL-RECHARGE-list'] } } }, { path: 'withdrawals-record', component: WithdrawalsRecordComponent }, { path: 'withdrawals-record/detail/:id', component: WithdrawalsDetailComponent }, { path: 'refund-record', component: RefundRecordComponent }, diff --git a/src/app/routes/sys-setting/components/announcement-message/announcement-message.component.html b/src/app/routes/sys-setting/components/announcement-message/announcement-message.component.html index e70f7e38..ff5a6eb5 100644 --- a/src/app/routes/sys-setting/components/announcement-message/announcement-message.component.html +++ b/src/app/routes/sys-setting/components/announcement-message/announcement-message.component.html @@ -25,8 +25,10 @@
- - + + +
this.roleAction(item, 2) }, { text: '删除', + acl: { ability: ['SYSTEM-ANNOUNCEMENT-delete'] }, click: item => this.deleteAction(item) }, ] diff --git a/src/app/routes/sys-setting/components/organization-management/organization-management.component.html b/src/app/routes/sys-setting/components/organization-management/organization-management.component.html index a7fdf0d0..38f4416d 100644 --- a/src/app/routes/sys-setting/components/organization-management/organization-management.component.html +++ b/src/app/routes/sys-setting/components/organization-management/organization-management.component.html @@ -1,7 +1,8 @@
- +
- 编辑 + 编辑 - 删除 + 删除 - 新增子组织 + 新增子组织
- 配置接口权限 + 配置接口权限 - 配置数据权限 + 配置数据权限 - + diff --git a/src/app/routes/sys-setting/components/sms-template/sms-template.component.html b/src/app/routes/sys-setting/components/sms-template/sms-template.component.html index 2b413ab5..41716b59 100644 --- a/src/app/routes/sys-setting/components/sms-template/sms-template.component.html +++ b/src/app/routes/sys-setting/components/sms-template/sms-template.component.html @@ -2,7 +2,7 @@
- +
- + - + \ No newline at end of file diff --git a/src/app/routes/sys-setting/components/sms-template/sms-template.component.ts b/src/app/routes/sys-setting/components/sms-template/sms-template.component.ts index 43d1df9c..7adb409a 100644 --- a/src/app/routes/sys-setting/components/sms-template/sms-template.component.ts +++ b/src/app/routes/sys-setting/components/sms-template/sms-template.component.ts @@ -1,4 +1,3 @@ - import { AfterViewInit, ChangeDetectorRef, Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { STColumn, STComponent, STRequestOptions } from '@delon/abc/st'; @@ -23,7 +22,7 @@ export class SmsTemplateComponent implements OnInit { isVisible = false; tempData = {}; isEdit = false; - + searchSchema: SFSchema = { properties: { templateName: { @@ -50,27 +49,27 @@ export class SmsTemplateComponent implements OnInit { templateName: { type: 'string', title: '模板名称', - ui: { placeholder: '请输入模板名称', errors: { require: '必填项'} } + ui: { placeholder: '请输入模板名称', errors: { require: '必填项' } } }, templateCode: { type: 'string', title: '模板编码', readOnly: this.isEdit, - ui: { placeholder: '请输入模板编码', errors: { require: '必填项'} } + ui: { placeholder: '请输入模板编码', errors: { require: '必填项' } } }, templateContent: { type: 'string', title: '模板内容', - ui: { placeholder: '请输入模板内容', errors: { require: '必填项'} } + ui: { placeholder: '请输入模板内容', errors: { require: '必填项' } } } }, - required: ['templateName','templateCode','templateContent'] - } + required: ['templateName', 'templateCode', 'templateContent'] + }; } columns: STColumn[] = [ - { title: '模板名称', className: 'text-center', index: 'templateName' }, - { title: '模板编码', className: 'text-center', index: 'templateCode' }, + { title: '模板名称', className: 'text-center', width: '200px', index: 'templateName' }, + { title: '模板编码', className: 'text-center', width: '140px', index: 'templateCode' }, { title: '模板内容', className: 'text-center', index: 'templateContent' }, // { // title: '创建人', className: 'text-center', index: 'content', @@ -79,21 +78,23 @@ export class SmsTemplateComponent implements OnInit { title: '更新时间', index: 'modifyTime', type: 'date', + width: '160px', className: 'text-center' }, { title: '操作', + width: '90px', buttons: [ { text: '编辑', - click: i => this.edit(i), + acl: { ability: ['SMS_TEMPLATE-save'] }, + click: i => this.edit(i) } ] } ]; - constructor(public service: SystemService, private nzModalService: NzModalService, private route: ActivatedRoute) { - } + constructor(public service: SystemService, private nzModalService: NzModalService, private route: ActivatedRoute) {} ngOnInit(): void { this.initSF(); @@ -144,7 +145,7 @@ export class SmsTemplateComponent implements OnInit { templateCode, templateName, templateContent - } + }; this.service.request(this.service.$api_smsTemplate_edit, params).subscribe(res => { // console.log(res); @@ -152,8 +153,7 @@ export class SmsTemplateComponent implements OnInit { this.isVisible = false; this.st.reload(); } - }) - + }); } handleCancel(): void { 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 3eb42854..fb77019d 100644 --- a/src/app/routes/sys-setting/sys-setting-routing.module.ts +++ b/src/app/routes/sys-setting/sys-setting-routing.module.ts @@ -54,9 +54,9 @@ const routes: Routes = [ { path: 'network-freight/new/:id', component: NetworkFreightNewComponent }, { path: 'close-account', component: CloseAccountComponent }, // { path: 'btn-management', component: BtnManagementComponent }, - { path: 'announcement-message', component: AnnouncementMessageComponent }, + { path: 'announcement-message', component: AnnouncementMessageComponent, data: { guard: { ability: ['SYSTEM-ANNOUNCEMENT-list'] } } }, { path: 'insurance-set', component: InsuranceSetComponent }, - { path: 'sms-template', component: SmsTemplateComponent } + { path: 'sms-template', component: SmsTemplateComponent, data: { guard: { ability: ['SMS_TEMPLATE-search'] } } } ]; @NgModule({ diff --git a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts index b56088d4..4bc5640d 100644 --- a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts +++ b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts @@ -290,11 +290,11 @@ export class InvoiceDetailComponent implements OnInit { { title: '数量', render: 'vatqty', width: 140, className: 'text-right' }, { title: '金额', - index: 'vattax', + index: 'vatmoney', width: 140, type: 'widget', className: 'text-right', - widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vattax }) } + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vatmoney }) } }, { title: '税率', @@ -305,11 +305,11 @@ export class InvoiceDetailComponent implements OnInit { }, { title: '税额', - index: 'vatnotax', + index: 'vattax', width: 140, type: 'widget', className: 'text-right', - widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vatnotax }) } + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vattax }) } } ]; } diff --git a/src/app/routes/vehicle/components/list/list.component.html b/src/app/routes/vehicle/components/list/list.component.html index e2e98417..7c2dbd77 100644 --- a/src/app/routes/vehicle/components/list/list.component.html +++ b/src/app/routes/vehicle/components/list/list.component.html @@ -16,17 +16,10 @@
- - + +