diff --git a/src/app/core/guards/auth.guard.ts b/src/app/core/guards/auth.guard.ts index 8fa924fc..346a0310 100644 --- a/src/app/core/guards/auth.guard.ts +++ b/src/app/core/guards/auth.guard.ts @@ -1,10 +1,10 @@ /* - * @Description : + * @Description : * @Version : 1.0 * @Author : Shiming * @Date : 2022-01-25 16:03:45 * @LastEditors : Shiming - * @LastEditTime : 2022-01-26 18:04:46 + * @LastEditTime : 2022-02-09 17:23:22 * @FilePath : \\tms-obc-web\\src\\app\\core\\guards\\auth.guard.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -28,46 +28,56 @@ import { Observable, of } from 'rxjs'; import { delay, map, switchMap, tap } from 'rxjs/operators'; @Injectable() -export class AuthGuard implements CanActivate, CanActivateChild { +export class AuthGuard extends ACLGuard { constructor( - private srv: ACLService, + srv: ACLService, + public srv1: ACLService, private baseService: BaseService, private menuService: MenuService, - private router: Router, - private injector: Injector - ) {} + router: Router, + private inject: Injector + ) { + super(srv, router, inject); + } - canActivate(route: ActivatedRouteSnapshot, _state: RouterStateSnapshot | null): Observable { + canActivate(route: ActivatedRouteSnapshot, _state: RouterStateSnapshot): Observable { if (Object.keys(route.params)?.length > 0 || !route.routeConfig?.path) { - return this.handle(); + return this.handle(route, _state, 1); } else { - return this.handle(_state?.url); + return this.handle(route, _state, 1, _state?.url); } } canActivateChild(childRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { - return this.handle(this.settingRoute(childRoute.params, state.url)); + return this.handle(childRoute, state, 2, this.settingRoute(childRoute.params, state.url)); } - private handle(route?: string): Observable { - if (!route) { - return of(true); + private handle(route: ActivatedRouteSnapshot, state: RouterStateSnapshot, type: 1 | 2, router?: string): Observable { + if (!router) { + if (type === 1) { + return super.canActivate(route, state); + } else { + return super.canActivateChild(route, state); + } } - return this.baseService.request('/api/mdc/cuc/functionButton/getUserFunctionButton', { link: route }).pipe( + // console.log(route, state, type, router); + + return this.baseService.request('/api/mdc/cuc/functionButton/getUserFunctionButton', { link: router }).pipe( switchMap(res => { if (res) { - console.log('666') - console.log(res) - // this.srv.setAbility(res.abilities || []); - // this.menuService.resume(); - this.baseService.request('/api/mdc/cuc/enterpriseProject/getUserDefaultEnterpriseProject').subscribe((res: any) => { - if(!res.enterpriseIdentity){ - this.srv.setAbility(res.abilities || []); - this.menuService.resume(); - } - }) + // if (router === '/ticket/invoice-requested') { + // this.srv1.setAbility(['TICKET-INVOICE-REQUESTED-list']); + // } else { + // this.srv1.setAbility(res.abilities || []); + // } + this.srv1.setAbility(res.abilities || []); + this.menuService.resume(); + } + if (type === 1) { + return super.canActivate(route, state); + } else { + return super.canActivateChild(route, state); } - return of(true); }) ); } diff --git a/src/app/core/guards/token.guard.ts b/src/app/core/guards/token.guard.ts index 061317cf..c043a978 100644 --- a/src/app/core/guards/token.guard.ts +++ b/src/app/core/guards/token.guard.ts @@ -1,5 +1,5 @@ import { Inject, Injectable, Injector } from '@angular/core'; -import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router'; +import { ActivatedRouteSnapshot, CanActivate, CanActivateChild, Router, RouterStateSnapshot } from '@angular/router'; import { sysConf } from '@conf/sys.conf'; import { CoreService } from '@core'; import { ACLGuard, ACLService } from '@delon/acl'; @@ -7,10 +7,8 @@ import { EAUserService } from '@shared'; import { Observable, of } from 'rxjs'; @Injectable() -export class EATokenGuard extends ACLGuard { - constructor(srv: ACLService, router: Router, private eaUserSrv: CoreService, private router2: Router, private inject: Injector) { - super(srv, router, inject); - } +export class EATokenGuard implements CanActivate, CanActivateChild { + constructor(srv: ACLService, router: Router, private eaUserSrv: CoreService, private router2: Router, private inject: Injector) {} canActivate(route: ActivatedRouteSnapshot, _state: RouterStateSnapshot | null): Observable { const canOpen = this.eaUserSrv.loginStatus; @@ -22,7 +20,7 @@ export class EATokenGuard extends ACLGuard { }); return of(!canOpen); } - return super.canActivate(route, _state); + return of(true); } canActivateChild(childRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { @@ -35,6 +33,6 @@ export class EATokenGuard extends ACLGuard { }); return of(!canOpen); } - return super.canActivateChild(childRoute, state); + return of(true); } } diff --git a/src/app/routes/financial-management/components/cost-management/cost-management.component.ts b/src/app/routes/financial-management/components/cost-management/cost-management.component.ts index 756639a0..5eecf4e9 100644 --- a/src/app/routes/financial-management/components/cost-management/cost-management.component.ts +++ b/src/app/routes/financial-management/components/cost-management/cost-management.component.ts @@ -288,7 +288,7 @@ export class CostManagementComponent implements OnInit { { title: '应付金额', render: 'hrmoney', width: 100 ,className: 'text-right',}, { title: '收/付款金额', render: 'hrpaymoney', width: 120 ,className: 'text-right',}, { title: '开/收票金额', render: 'hrvatmoney', width: 120 ,className: 'text-right',}, - { title: '创建时间', index: 'auditTime', type: 'date', width: 200 ,className: 'text-center',}, + { title: '创建时间', index: 'createTime', type: 'date', width: 200 ,className: 'text-center',}, { title: '状态', index: 'stsLabel', width: 90 ,className: 'text-center',}, { title: '操作', diff --git a/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.html b/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.html index 726d7da1..30887e7d 100644 --- a/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.html +++ b/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.html @@ -32,7 +32,7 @@ {{headerInfo?.payMoney}} -
+
{{headerInfo?.payDate}} @@ -46,7 +46,7 @@ {{headerInfo?.payRemarks}}
-
+
{{headerInfo?.payModeLabel}} @@ -60,7 +60,7 @@
- + \ No newline at end of file diff --git a/src/app/routes/financial-management/components/payment-order/payment-order.component.ts b/src/app/routes/financial-management/components/payment-order/payment-order.component.ts index 7d257c66..95454878 100644 --- a/src/app/routes/financial-management/components/payment-order/payment-order.component.ts +++ b/src/app/routes/financial-management/components/payment-order/payment-order.component.ts @@ -29,9 +29,20 @@ export class PaymentOrderComponent implements OnInit { beforeReq = (requestOptions: STRequestOptions) => { if (this.sf) { - Object.assign(requestOptions.body, { - ...this.sf.value - }); + let params = {...this.sf.value}; + if(params.payDate){ + const payDate = {start:this.sf?.value?.payDate?.[0],end:this.sf?.value?.payDate?.[1]} + params.payDate = payDate; + } + if(params.payDate2){ + const payDate2 = {start:this.sf?.value?.payDate2?.[0],end:this.sf?.value?.payDate2?.[1]} + params.payDate2 = payDate2; + } + if(params.createTime){ + const createTime = {start:this.sf?.value?.createTime?.[0],end:this.sf?.value?.createTime?.[1]} + params.createTime = createTime; + } + Object.assign(requestOptions.body,params ); } return requestOptions; }; @@ -82,7 +93,7 @@ export class PaymentOrderComponent implements OnInit { hidden: true } }, - paycodes: { + paycode: { type: 'string', title: '付款单号', }, @@ -111,9 +122,10 @@ export class PaymentOrderComponent implements OnInit { type: 'string', title: '付款类型', ui: { - widget: 'select', + widget: 'dict-select', + containsAllLable: true, + params: { dictKey: 'pay:type' }, placeholder: '请选择', - allowClear: true, visibleIf: { expand: (value: boolean) => value } @@ -123,9 +135,10 @@ export class PaymentOrderComponent implements OnInit { type: 'string', title: '付款方式', ui: { - widget: 'select', + widget: 'dict-select', + containsAllLable: true, + params: { dictKey: 'pay:mode' }, placeholder: '请选择', - allowClear: true, visibleIf: { expand: (value: boolean) => value } @@ -143,7 +156,7 @@ export class PaymentOrderComponent implements OnInit { } } }, - billHCodes: { + billCode: { type: 'string', title: '订单号', ui: { @@ -155,7 +168,7 @@ export class PaymentOrderComponent implements OnInit { } } }, - paydate: { + payDate: { title: '要求付款日期', type: 'string', ui: { @@ -166,7 +179,7 @@ export class PaymentOrderComponent implements OnInit { } } as SFDateWidgetSchema }, - createTi1me: { + payDate2: { title: '确认日期', type: 'string', ui: { @@ -177,25 +190,19 @@ export class PaymentOrderComponent implements OnInit { } } as SFDateWidgetSchema }, - waybillHCodes: { + waybillCode: { type: 'string', title: '运单号', ui: { - widget: 'select', - placeholder: '请选择', - allowClear: true, visibleIf: { expand: (value: boolean) => value } } }, - feeHCodes: { + feeCode: { type: 'string', title: '费用号', ui: { - widget: 'select', - placeholder: '请选择', - allowClear: true, visibleIf: { expand: (value: boolean) => value } @@ -212,7 +219,7 @@ export class PaymentOrderComponent implements OnInit { } } as SFDateWidgetSchema }, - remarks: { + payRemarks: { type: 'string', title: '付款备注', ui: { @@ -240,7 +247,7 @@ export class PaymentOrderComponent implements OnInit { className: 'text-right', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.payMoney }) } }, - { title: '付款类型', index: 'payType', width: 130 }, + { title: '付款类型', index: 'payTypeLabel', width: 130 }, { title: '付款方式', index: 'payModeLabel', width: 130 }, { title: '结算客户', index: 'cnoName', width: 160 }, { title: '收款人', index: 'hrToLabel', width: 150 }, diff --git a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts index 2d78ebd2..5347d024 100644 --- a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts +++ b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts @@ -20,6 +20,7 @@ import { of } from 'rxjs'; import { PublishSuccessComponent } from '../onecar-publish/publish-success/publish-success.component'; import { PublishAddressListComponent } from '../onecar-publish/address-list/address-list.component'; import { TranAgreementComponent } from '../tran-agreement/tran-agreement.component'; +import differenceInCalendarDays from 'date-fns/differenceInCalendarDays'; @Component({ selector: 'app-publish-goods-bulk-publish', templateUrl: './bulk-publish.component.html', @@ -141,12 +142,26 @@ export class SupplyManagementBulkPublishComponent implements OnInit { } }, deadlineTime: { - title: '截至日期', + title: '截止日期', type: 'string', format: 'date-time', ui: { placeholder: '请输入', - format: 'yyyy-MM-dd HH:mm:ss' + format: 'yyyy-MM-dd HH:mm:ss', + disabledDate: (current: Date): boolean => { + let d = new Date(); + let year = d.getFullYear(); + let month = d.getMonth(); + let date = d.getDate(); + let mydate = new Date(year, month + 3, date); + return differenceInCalendarDays(current, new Date()) < 0 || differenceInCalendarDays(current, mydate) > 0; + }, + validator: (val) => { + if( new Date(val) { + let d = new Date(); + let year = d.getFullYear(); + let month = d.getMonth(); + let date = d.getDate(); + let mydate = new Date(year, month + 3, date); + return differenceInCalendarDays(current, new Date()) < 0 || differenceInCalendarDays(current, mydate) > 0; + }, + validator: (val) => { + if( new Date(val) + [roleId]="i.id" [isAuthorityIdDTOList]="roleInfoData.authority || []" + [authorityAssistId]="roleInfoData.authorityAssistId || []"> diff --git a/src/app/routes/sys-setting/components/role-management/edit/edit.component.ts b/src/app/routes/sys-setting/components/role-management/edit/edit.component.ts index 89a1a409..966a809e 100644 --- a/src/app/routes/sys-setting/components/role-management/edit/edit.component.ts +++ b/src/app/routes/sys-setting/components/role-management/edit/edit.component.ts @@ -100,9 +100,10 @@ export class SettingRoleEditComponent implements OnInit { id: this.i.id }; this.service.request(this.service.$api_getRoleInfo, params).subscribe(res => { - this.roleInfoData = res; - this.roleInfoData.authority = res.authority || []; - this.roleInfoData.authorityAssistId = res.authorityAssistId || []; + if (res) { + this.roleInfoData = res; + } + if (this.source === '') { this.initSF(); } @@ -121,14 +122,12 @@ export class SettingRoleEditComponent implements OnInit { // this.service.msgSrv.warning('请选择权限!'); // return; // } - console.log(this.menu.nzTreeComponent.getCheckedNodeList()); - const selectedFun = this.menu?.nzTreeComponent?.getCheckedNodeList()?.map(node => ({ authorityId: node.key })); - const authorityAssistId = selectedFun?.map(node => node.authorityId); + const auths = this.menu?.washTree(); const params: any = { id: this.i.id, ...this.sf.value, - authority: selectedFun, - authorityAssistId: authorityAssistId + authority: auths.authority, + authorityAssistId: auths.authorityAssistId }; // if (this.sf) { // this.appList.forEach(item => { diff --git a/src/app/routes/sys-setting/components/role-management/menu/menu.component.ts b/src/app/routes/sys-setting/components/role-management/menu/menu.component.ts index 4f0d30da..806e2da6 100644 --- a/src/app/routes/sys-setting/components/role-management/menu/menu.component.ts +++ b/src/app/routes/sys-setting/components/role-management/menu/menu.component.ts @@ -1,7 +1,7 @@ -import { ChangeDetectorRef, Component, EventEmitter, Input, OnChanges, OnInit, Output, ViewChild } from '@angular/core'; +import { ChangeDetectorRef, Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges, ViewChild } from '@angular/core'; import { ModalHelper, _HttpClient } from '@delon/theme'; import { EAEnvironmentService } from '@shared'; -import { NzFormatEmitEvent, NzTreeNodeOptions } from 'ng-zorro-antd/core/tree'; +import { NzFormatEmitEvent, NzTreeNode, NzTreeNodeOptions } from 'ng-zorro-antd/core/tree'; import { NzTreeComponent } from 'ng-zorro-antd/tree'; import { SystemService } from '../../../services/system.service'; import { Funcs } from './funcs'; @@ -11,9 +11,9 @@ import { Funcs } from './funcs'; templateUrl: './menu.component.html', styleUrls: ['menu.less'] }) -export class SettingMenuComponent implements OnInit { +export class SettingMenuComponent implements OnInit, OnChanges { @ViewChild('nzTreeComponent', { static: false }) nzTreeComponent!: NzTreeComponent; - origin: any = { buttonInfoList: Funcs[0].children, dictList: Funcs[0].children }; + origin: any = { buttonInfoList: [], dictList: [] }; node: any = {}; authority: any[] = []; defaultSelectedKeys: any[] = []; @@ -31,12 +31,15 @@ export class SettingMenuComponent implements OnInit { constructor(public service: SystemService, private cdr: ChangeDetectorRef, private envSrv: EAEnvironmentService) { this.getAllFunction(); } - - ngOnInit() { - if (this.type === 'edit') { - this.authority = this.isAuthorityIdDTOList; + ngOnChanges(changes: SimpleChanges): void { + if (changes.isAuthorityIdDTOList) { + if (this.type === 'edit') { + this.authority = this.isAuthorityIdDTOList || []; + } } } + + ngOnInit() {} getAllFunction() { this.service .request(this.service.$api_getAllFunctionInfoByAppId, { appId: this.envSrv.env.appId }, 'POST', true, 'FORM') @@ -51,7 +54,7 @@ export class SettingMenuComponent implements OnInit { this.cdr.detectChanges(); }); } - addAuthority(origin: { id: any; all: any }, node: { buttonInfoList: any[] }, item?: { checked: any; id: any }) { + addAuthority(origin: { id: any; all: any }, node: { buttonInfoList: any[] }, item?: { checked: any; functionButtonId: any }) { if (this.authority.length && this.authority.filter(authItem => authItem.authorityId === origin.id).length) { // 判断此菜单权限是否已经存在权限列表中 // 当前操作菜单id存在权限列表里 @@ -61,14 +64,14 @@ export class SettingMenuComponent implements OnInit { if (item) { // 单选 if (item.checked) { - if (menuItem.buttonAuthorityIds.indexOf(item.id) === -1) { + if (menuItem.buttonAuthorityIds.indexOf(item.functionButtonId) === -1) { // 如果该按钮在数据权限数组中不存在 - menuItem.buttonAuthorityIds.push(item.id); + menuItem.buttonAuthorityIds.push(item.functionButtonId); } } else { if (menuItem.buttonAuthorityIds && menuItem.buttonAuthorityIds.length) { menuItem.buttonAuthorityIds.forEach((btnItem: any, index: any) => { - if (btnItem === item.id) { + if (btnItem === item.functionButtonId) { menuItem.buttonAuthorityIds.splice(index, 1); } }); @@ -99,7 +102,7 @@ export class SettingMenuComponent implements OnInit { const buttonAuthorityIds = []; if (item) { // 全选 - buttonAuthorityIds.push(item.id); + buttonAuthorityIds.push(item.functionButtonId); } else { node.buttonInfoList.forEach((nodeItem: { id: any; checked: boolean }) => { if (origin.all) { @@ -110,7 +113,8 @@ export class SettingMenuComponent implements OnInit { } const obj: any = { authorityId: origin.id, - buttonAuthorityIds + buttonAuthorityIds, + dataAuthority: [] }; this.authority.push(obj); } @@ -238,46 +242,44 @@ export class SettingMenuComponent implements OnInit { }); } nzEvent(event: any): void { - const ele = event.event.target as HTMLElement; this.origin = event.node.origin; this.node = event.node.origin; if (!event.node.origin.isLeaf) { event.node.isExpanded = !event.node.isExpanded; } else { - // this.initButtonList(event.node.key, event.node.origin); + this.initButtonList(event.node.key, event.node.origin); // this.initDictList(event.node.key, event.node.origin); } } washTree() { - console.log(this.nzTreeComponent.getCheckedNodeList()); - - // const authorityMenu: any[] = []; // this.authority - // const tempAuthorityIdDTOListMenu: any[] = []; - // const checkedNode: any = this.nzTreeComponent.getCheckedNodeList(); - // const halfCheckedNode: any = this.nzTreeComponent.getHalfCheckedNodeList(); - // this.authorityAssistId = []; - // halfCheckedNode.forEach((item: { key: any }) => { - // authorityMenu.push({ authorityId: item.key }); - // tempAuthorityIdDTOListMenu.push(item.key); - // }); - // this.overWashTree(checkedNode, tempAuthorityIdDTOListMenu, authorityMenu); - // if (this.authority && this.authority.length) { - // this.authority.forEach(item => { - // if (tempAuthorityIdDTOListMenu.indexOf(item.authorityId) !== -1) { - // tempAuthorityIdDTOListMenu.forEach((oldItem, oldIndex) => { - // if (oldItem === item.authorityId) { - // authorityMenu[oldIndex] = item; - // } - // }); - // } - // }); - // } - // const result = { - // authority: authorityMenu, - // authorityAssistId: this.authorityAssistId - // }; - // this.changeData.emit(result); + const authorityMenu: any[] = []; // this.authority + const tempAuthorityIdDTOListMenu: any[] = []; + const checkedNode: any = this.nzTreeComponent.getCheckedNodeList(); + const halfCheckedNode: any = this.nzTreeComponent.getHalfCheckedNodeList(); + this.authorityAssistId = []; + halfCheckedNode.forEach((item: { key: any }) => { + authorityMenu.push({ authorityId: item.key }); + tempAuthorityIdDTOListMenu.push(item.key); + }); + this.overWashTree(checkedNode, tempAuthorityIdDTOListMenu, authorityMenu); + if (this.authority && this.authority.length) { + this.authority.forEach(item => { + if (tempAuthorityIdDTOListMenu.indexOf(item.authorityId) !== -1) { + tempAuthorityIdDTOListMenu.forEach((oldItem, oldIndex) => { + if (oldItem === item.authorityId) { + authorityMenu[oldIndex] = item; + } + }); + } + }); + } + const result = { + authority: authorityMenu, + authorityAssistId: this.authorityAssistId + }; + this.changeData.emit(result); + return result; } overWashTree(children: any[], tempAuthorityIdDTOListMenu: any[], authorityMenu: any[]) { children.forEach((item: any) => { @@ -315,9 +317,9 @@ export class SettingMenuComponent implements OnInit { // 如果当前菜单Id等于暂存权限数组的Id if (item.buttonAuthorityIds && item.buttonAuthorityIds.length) { // 如果当前菜单Id权限数组不为空 - origin.buttonInfoList.forEach((btnItem: { id: any; checked: boolean }) => { + origin.buttonInfoList.forEach((btnItem: { functionButtonId: any; checked: boolean }) => { // 判断已有权限id是否存在 - if (item.buttonAuthorityIds.indexOf(btnItem.id) !== -1) { + if (item.buttonAuthorityIds.indexOf(btnItem.functionButtonId) !== -1) { btnItem.checked = true; } else { btnItem.checked = false; diff --git a/src/app/routes/sys-setting/services/system.service.ts b/src/app/routes/sys-setting/services/system.service.ts index a3191854..fd765088 100644 --- a/src/app/routes/sys-setting/services/system.service.ts +++ b/src/app/routes/sys-setting/services/system.service.ts @@ -164,7 +164,7 @@ export class SystemService extends BaseService { $api_getRoleTemplateInfo: string = ''; - $api_getFunctionButtonInfo: string = ''; + $api_getFunctionButtonInfo: string = '/api/mdc/cuc/functionButton/getFunctionButtonByFunctionId'; $api_getFunctionDataInfo: string = ''; $api_getAppList: string = ''; $api_getRoleTemplateListByAppId: string = ''; 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 4f46c02a..e468bdd9 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 @@ -36,10 +36,10 @@ - - - - + + + + @@ -70,7 +70,7 @@ > {{ item.vatappcode }}
- + 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 c9f22479..fce6a332 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 @@ -23,7 +23,7 @@ export class InvoiceRequestedComponent implements OnInit { sf!: SFComponent; @ViewChild('rejectModal', { static: false }) rejectModal!: any; - resourceStatus!: any; + resourceStatus: any = '1'; columns: STColumn[] = this.initST(); searchSchema: SFSchema = this.initSF(); @@ -252,7 +252,7 @@ export class InvoiceRequestedComponent implements OnInit { placeholder: '请输入' } }, - orderSn3: { + feeHCode: { type: 'string', title: '费用号', ui: { @@ -271,7 +271,7 @@ export class InvoiceRequestedComponent implements OnInit { asyncData: () => this.service.getEnterpriseProject() } }, - ltd: { + ltdId: { type: 'string', title: '网络货运人', ui: { @@ -285,7 +285,7 @@ export class InvoiceRequestedComponent implements OnInit { }, default: '' }, - otherReq: { + otherremarks: { type: 'string', title: '其他需求', enum: [{ label: '全部', value: '' }], @@ -396,7 +396,14 @@ export class InvoiceRequestedComponent implements OnInit { { title: '注册地址', index: 'registerAddr', width: 140 }, { title: '注册电话', index: 'registerPhone', width: 120 }, { title: '服务名称', index: 'vatname', width: 100 }, - { title: '销货清单', index: 'isdetail', width: 100 }, + { + title: '销货清单', + index: 'isdetail', + width: 100, + format: item => { + return item.isdetail === 0 ? '不需要' : '需要'; + } + }, { title: '其他要求', index: 'otherremarks', width: 100 }, { title: '申请人', index: 'applyName', width: 90 }, { title: '申请时间', index: 'applyTime', type: 'date', width: 150 }, @@ -429,7 +436,7 @@ export class InvoiceRequestedComponent implements OnInit { { text: '查看原因
', click: item => this.showReason(item) - }, + } // { // text: '下载对账单' // // click: item => this.rejectAction(item) 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 ea2145f5..c420a6a8 100644 --- a/src/app/routes/ticket-management/ticket-management-routing.module.ts +++ b/src/app/routes/ticket-management/ticket-management-routing.module.ts @@ -15,7 +15,7 @@ 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/detail/:id', component: InvoiceDetailComponent }, @@ -28,7 +28,7 @@ const routes: Routes = [ { path: 'input-invoice', component: InputInvoiceComponent }, { path: 'input-invoice/detail/:id', component: InputInvoiceDetailComponent }, { path: 'input-invoice/edit/:id', component: EditCollectionInvoiceComponent }, - { path: 'express-info', component: ExpressInfoComponent }, + { path: 'express-info', component: ExpressInfoComponent } ]; @NgModule({ diff --git a/src/app/routes/vehicle/components/audit/audit.component.html b/src/app/routes/vehicle/components/audit/audit.component.html index 28136645..f0ee9c1b 100644 --- a/src/app/routes/vehicle/components/audit/audit.component.html +++ b/src/app/routes/vehicle/components/audit/audit.component.html @@ -33,7 +33,7 @@
- +