Commit 6ae0c009 by 牛晓林

latest

parents 4d424452 baee629e
......@@ -7,6 +7,7 @@ import {
HttpErrorResponse,
HttpEvent,
HttpResponseBase,
HttpResponse,
} from '@angular/common/http';
import { Observable, of, throwError } from 'rxjs';
import { mergeMap, catchError } from 'rxjs/operators';
......@@ -71,20 +72,20 @@ export class DefaultInterceptor implements HttpInterceptor {
// 错误内容:{ status: 1, msg: '非法参数' }
// 正确内容:{ status: 0, response: { } }
// 则以下代码片断可直接适用
// if (event instanceof HttpResponse) {
// const body: any = event.body;
// if (body && body.status !== 0) {
if (event instanceof HttpResponse) {
const body: any = event.body;
if (body && body.status !== 0) {
// this.msg.error(body.msg);
// // 继续抛出错误中断后续所有 Pipe、subscribe 操作,因此:
// // this.http.get('/').subscribe() 并不会触发
// return throwError({});
// } else {
// // 重新修改 `body` 内容为 `response` 内容,对于绝大多数场景已经无须再关心业务状态码
// return of(new HttpResponse(Object.assign(event, { body: body.response })));
// // 或者依然保持完整的格式
// 继续抛出错误中断后续所有 Pipe、subscribe 操作,因此:
// this.http.get('/').subscribe() 并不会触发
return throwError({});
} else {
// 重新修改 `body` 内容为 `response` 内容,对于绝大多数场景已经无须再关心业务状态码
return of(new HttpResponse(Object.assign(event, { body: body.response })));
// 或者依然保持完整的格式
// return of(event);
// }
// }
}
}
break;
case 401:
this.notification.error(`未登录或登录已过期,请重新登录。`, ``);
......
......@@ -51,7 +51,13 @@ import { DelonAuthConfig } from '@delon/auth';
export function fnDelonAuthConfig(): DelonAuthConfig {
return {
...new DelonAuthConfig(),
...({ login_url: '/passport/login' } as DelonAuthConfig),
...({
login_url: '/passport/login',
token_send_key: 'JSESSIONID',
token_send_place: 'url',
token_send_template: '${token}',
ignores: [/\/login/, /^assets\//, /passport\//],
} as DelonAuthConfig),
};
}
......@@ -75,9 +81,7 @@ const GLOBAL_CONFIG_PROVIDES = [
// #endregion
@NgModule({
imports: [
AlainThemeModule.forRoot()
],
imports: [AlainThemeModule.forRoot()],
})
export class DelonModule {
constructor(@Optional() @SkipSelf() parentModule: DelonModule) {
......
<p>
固定资产台账
</p>
<page-header [title]="'资产列表'" [extra]="extra">
<form nz-form [nzLayout]="'inline'" (ngSubmit)="getData()" class="search__form">
<div nz-row [nzGutter]="{ xs: 8, sm: 8, md: 8, lg: 24, xl: 48, xxl: 48 }">
<div nz-col nzMd="8" nzSm="24">
<nz-form-item>
<nz-form-label nzFor="no">规则编号</nz-form-label>
<nz-form-control>
<input nz-input [(ngModel)]="q.no" name="no" placeholder="请输入" id="no">
</nz-form-control>
</nz-form-item>
</div>
<div nz-col nzMd="8" nzSm="24">
<nz-form-item>
<nz-form-label nzFor="status">使用状态</nz-form-label>
<nz-form-control>
<nz-select [(ngModel)]="q.status" name="status" id="status" [nzPlaceHolder]="'请选择'" [nzShowSearch]="true">
<nz-option *ngFor="let i of status; let idx = index" [nzLabel]="i.text" [nzValue]="idx"></nz-option>
</nz-select>
</nz-form-control>
</nz-form-item>
</div>
<div nz-col nzMd="8" nzSm="24" *ngIf="expandForm">
<nz-form-item>
<nz-form-label nzFor="callNo">调用次数</nz-form-label>
<nz-form-control>
<input nz-input id="callNo">
</nz-form-control>
</nz-form-item>
</div>
<div nz-col nzMd="8" nzSm="24" *ngIf="expandForm">
<nz-form-item>
<nz-form-label nzFor="updatedAt">更新日期</nz-form-label>
<nz-form-control>
</nz-form-control>
</nz-form-item>
</div>
<div nz-col nzMd="8" nzSm="24" *ngIf="expandForm">
<nz-form-item>
<nz-form-label nzFor="status2">使用状态</nz-form-label>
<nz-form-control>
<nz-select [nzPlaceHolder]="'请选择'" nzId="status2" [nzShowSearch]="true">
<nz-option *ngFor="let i of status; let idx = index" [nzLabel]="i.text" [nzValue]="idx"></nz-option>
</nz-select>
</nz-form-control>
</nz-form-item>
</div>
<div nz-col nzMd="8" nzSm="24" *ngIf="expandForm">
<nz-form-item>
<nz-form-label nzFor="status3">使用状态</nz-form-label>
<nz-form-control>
<nz-select [nzPlaceHolder]="'请选择'" nzId="status3" [nzShowSearch]="true">
<nz-option *ngFor="let i of status; let idx = index" [nzLabel]="i.text" [nzValue]="idx"></nz-option>
</nz-select>
</nz-form-control>
</nz-form-item>
</div>
<div nz-col [nzSpan]="24">
<button nz-button type="submit" [nzType]="'primary'" [nzLoading]="loading">查询</button>
<button nz-button type="reset" (click)="reset()" class="mx-sm">重置</button>
<a (click)="expandForm=!expandForm">
{{expandForm ? '收起' : '展开'}}
<i class="anticon" [class.anticon-down]="!expandForm" [class.anticon-up]="expandForm"></i>
</a>
</div>
</div>
</form>
</page-header>
<nz-list [nzLoading]="loading" [nzDataSource]="list" [nzRenderItem]="item"
[nzGrid]="{gutter: 24, lg: 8, md: 12, sm: 24, xs: 24 }">
<ng-template #item let-item>
<nz-list-item>
<nz-card nzHoverable *ngIf="item !== null" [nzActions]="[op1]">
<ng-template #op1>
<a [routerLink]="['./detail', item.id]">查看</a>
</ng-template>
<nz-card-meta [nzAvatar]="nzAvatar" [nzTitle]="nzTitle" [nzDescription]="nzDescription">
<ng-template #nzTitle>
<a (click)="msg.success('标题:' + item.id);">{{item.name}}</a>
</ng-template>
<ng-template #nzDescription>
<ellipsis>xxxxxxxxxxxxxxxxxxxxxxxxxxxxx</ellipsis>
</ng-template>
</nz-card-meta>
</nz-card>
</nz-list-item>
</ng-template>
</nz-list>
import { Component, OnInit } from '@angular/core';
import { ListService } from '@core/services/list/list.service';
@Component({
selector: 'app-fixed-assets',
templateUrl: './fixed-assets.component.html',
styleUrls: ['./fixed-assets.component.less']
styleUrls: ['./fixed-assets.component.less'],
})
export class FixedAssetsComponent implements OnInit {
constructor() { }
list: any[] = [];
loading = true;
q: any = {
pi: 1,
ps: 10,
sorter: '',
status: null,
statusList: [],
};
expandForm = false;
constructor(private listSrv: ListService) {}
ngOnInit() {
}
this.loading = true;
this.listSrv.getKindAssetList(2).subscribe(res => {
this.list = res['rows'];
console.log(this.list);
this.loading = false;
});
// this.http.get('/api/list', { count: 8 }).subscribe((res: any) => {
// this.list = this.list.concat(res);
// this.loading = false;
// this.cdr.detectChanges();
// });
}
}
<page-header [title]="'详情'"></page-header>
<nz-collapse>
<nz-collapse-panel *ngFor="let panel of panels" [nzHeader]="panel.name" [nzActive]="panel.active"
[nzDisabled]="panel.disabled">
<ng-container *ngIf="panel.id == 1">
<ng-container *ngFor="let item of panel.items">
<span>{{item.text}}</span>
</ng-container>
</ng-container>
</nz-collapse-panel>
</nz-collapse>
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { FixedDetailComponent } from './fixed-detail.component';
describe('FixedDetailComponent', () => {
let component: FixedDetailComponent;
let fixture: ComponentFixture<FixedDetailComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ FixedDetailComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(FixedDetailComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-fixed-detail',
templateUrl: './fixed-detail.component.html',
styleUrls: ['./fixed-detail.component.less'],
})
export class FixedDetailComponent implements OnInit {
panels = [
{
id: 1,
active: true,
name: '基本情况',
disabled: false,
items: [
{
text: '资产编号',
fieid: 'num',
},
{
text: '资产名称',
fieid: 'name',
},
{
text: '规格型号',
fieid: 'modelNum',
},
{
text: '资产分类',
fieid: 'assetClass',
},
{
text: '资产来源',
fieid: 'source',
},
{
text: '资产状态',
fieid: 'assetState',
},
{
text: '验收单号',
fieid: 'acceptNum',
},
{
text: '领用单号',
fieid: 'receiveNum',
},
{
text: '购入日期',
fieid: 'buyDate',
},
{
text: '制造厂商',
fieid: 'madeFirms',
},
{
text: '出厂编码',
fieid: 'factoryCode',
},
{
text: '供应商',
fieid: 'supplier',
},
{
text: '工作场景',
fieid: 'workPlace',
},
{
text: '存放地',
fieid: 'storage',
},
{
text: '管理部门',
fieid: 'company.name',
},
{
text: '产权单位',
fieid: 'belongUnit.name',
},
{
text: '使用单位',
fieid: 'useUnit.name',
},
{
text: '所在项目部',
fieid: 'belongProject',
},
],
},
{
id: 2,
active: false,
disabled: false,
name: '财务信息',
},
{
id: 3,
active: false,
disabled: false,
name: '资产折旧',
},
{
id: 4,
active: false,
disabled: false,
name: '车辆信息',
},
{
id: 5,
active: false,
disabled: false,
name: '技术参数',
},
{
id: 6,
active: false,
disabled: false,
name: '合格证',
},
{
id: 7,
active: false,
disabled: false,
name: '资产照片',
},
{
id: 8,
active: false,
disabled: false,
name: '附件及资料',
},
{
id: 9,
active: false,
disabled: false,
name: '附属设备及配件',
},
{
id: 10,
active: false,
disabled: false,
name: '折旧记录',
},
{
id: 11,
active: false,
disabled: false,
name: '资产维修保养记录',
},
{
id: 12,
active: false,
disabled: false,
name: '资产盘点记录',
},
{
id: 13,
active: false,
disabled: false,
name: '资产使用记录',
},
];
constructor() {}
ngOnInit() {}
}
import { NgModule } from "@angular/core";
import { Routes, RouterModule } from "@angular/router";
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
// 资产信息
import { AnlageComponent } from "./assets-info/anlage/anlage.component";
import { AssetsCateComponent } from "./assets-info/assets-cate/assets-cate.component";
import { AssetsNatureComponent } from "./assets-info/assets-nature/assets-nature.component";
import { CateFixedAssetsComponent } from "./assets-info/cate-fixed-assets/cate-fixed-assets.component";
import { CustomComponent } from "./assets-info/custom/custom.component";
import { DepreciateComponent } from "./assets-info/depreciate/depreciate.component";
import { DepreciationRecordComponent } from "./assets-info/depreciation-record/depreciation-record.component";
import { FixedAssetsComponent } from "./assets-info/fixed-assets/fixed-assets.component";
import { HouseComponent } from "./assets-info/house/house.component";
import { PartsComponent } from "./assets-info/parts/parts.component";
import { PlantAccidentComponent } from "./assets-info/plant-accident/plant-accident.component";
import { PlantOperateComponent } from "./assets-info/plant-operate/plant-operate.component";
import { PlantVerifyComponent } from "./assets-info/plant-verify/plant-verify.component";
import { AnlageComponent } from './assets-info/anlage/anlage.component';
import { AssetsCateComponent } from './assets-info/assets-cate/assets-cate.component';
import { AssetsNatureComponent } from './assets-info/assets-nature/assets-nature.component';
import { CateFixedAssetsComponent } from './assets-info/cate-fixed-assets/cate-fixed-assets.component';
import { CustomComponent } from './assets-info/custom/custom.component';
import { DepreciateComponent } from './assets-info/depreciate/depreciate.component';
import { DepreciationRecordComponent } from './assets-info/depreciation-record/depreciation-record.component';
import { FixedAssetsComponent } from './assets-info/fixed-assets/fixed-assets.component';
import { HouseComponent } from './assets-info/house/house.component';
import { PartsComponent } from './assets-info/parts/parts.component';
import { PlantAccidentComponent } from './assets-info/plant-accident/plant-accident.component';
import { PlantOperateComponent } from './assets-info/plant-operate/plant-operate.component';
import { PlantVerifyComponent } from './assets-info/plant-verify/plant-verify.component';
// 资产保险
import { DangerComponent } from "./assets-insurance/danger/danger.component";
import { InsuranceComponent } from "./assets-insurance/insurance/insurance.component";
import { DangerComponent } from './assets-insurance/danger/danger.component';
import { InsuranceComponent } from './assets-insurance/insurance/insurance.component';
// 资产租凭
import { AssessComponent } from "./assets-lease/assess/assess.component";
import { AssetsLeaseHouseComponent } from "./assets-lease/house/house.component";
import { RentComponent } from "./assets-lease/rent/rent.component";
import { SubContractorComponent } from "./assets-lease/sub-contractor/sub-contractor.component";
import { AssessComponent } from './assets-lease/assess/assess.component';
import { AssetsLeaseHouseComponent } from './assets-lease/house/house.component';
import { RentComponent } from './assets-lease/rent/rent.component';
import { SubContractorComponent } from './assets-lease/sub-contractor/sub-contractor.component';
// 资产使用
import { AllotComponent } from "./assets-use/allot/allot.component";
import { ApplyComponent } from "./assets-use/apply/apply.component";
import { CancelStockComponent } from "./assets-use/cancel-stock/cancel-stock.component";
import { CheckComponent } from "./assets-use/check/check.component";
import { ContractComponent } from "./assets-use/contract/contract.component";
import { DispatchComponent } from "./assets-use/dispatch/dispatch.component";
import { LeaseComponent } from "./assets-use/lease/lease.component";
import { PayComponent } from "./assets-use/pay/pay.component";
import { PersonalChangeComponent } from "./assets-use/personal-change/personal-change.component";
import { PropertyChangeComponent } from "./assets-use/property-change/property-change.component";
import { ReceiveComponent } from "./assets-use/receive/receive.component";
import { RememberedComponent } from "./assets-use/remembered/remembered.component";
import { ScrapComponent } from "./assets-use/scrap/scrap.component";
import { TakeStockComponent } from "./assets-use/take-stock/take-stock.component";
import { UseComponent } from "./assets-use/use/use.component";
import { AllotComponent } from './assets-use/allot/allot.component';
import { ApplyComponent } from './assets-use/apply/apply.component';
import { CancelStockComponent } from './assets-use/cancel-stock/cancel-stock.component';
import { CheckComponent } from './assets-use/check/check.component';
import { ContractComponent } from './assets-use/contract/contract.component';
import { DispatchComponent } from './assets-use/dispatch/dispatch.component';
import { LeaseComponent } from './assets-use/lease/lease.component';
import { PayComponent } from './assets-use/pay/pay.component';
import { PersonalChangeComponent } from './assets-use/personal-change/personal-change.component';
import { PropertyChangeComponent } from './assets-use/property-change/property-change.component';
import { ReceiveComponent } from './assets-use/receive/receive.component';
import { RememberedComponent } from './assets-use/remembered/remembered.component';
import { ScrapComponent } from './assets-use/scrap/scrap.component';
import { TakeStockComponent } from './assets-use/take-stock/take-stock.component';
import { UseComponent } from './assets-use/use/use.component';
// 制造厂商
import { VendorComponent } from "./canon/vendor/vendor.component";
import { VendorComponent } from './canon/vendor/vendor.component';
// 设备维保
import { ServicePlanComponent } from "./device-maintain/service-plan/service-plan.component";
import { ServiceRecordComponent } from "./device-maintain/service-record/service-record.component";
import { ServicePlanComponent } from './device-maintain/service-plan/service-plan.component';
import { ServiceRecordComponent } from './device-maintain/service-record/service-record.component';
// 证件管理
import { DeviceComponent } from "./identity-manager/device/device.component";
import { StaffComponent } from "./identity-manager/staff/staff.component";
import { TypeComponent } from "./identity-manager/type/type.component";
import { UserComponent } from "./identity-manager/user/user.component";
import { DeviceComponent } from './identity-manager/device/device.component';
import { StaffComponent } from './identity-manager/staff/staff.component';
import { TypeComponent } from './identity-manager/type/type.component';
import { UserComponent } from './identity-manager/user/user.component';
// 单机车核算
import { BusinessComponent } from "./single-machine/business/business.component";
import { ConsumeComponent } from "./single-machine/consume/consume.component";
import { SingleComponent } from "./single-machine/single/single.component";
import { BusinessComponent } from './single-machine/business/business.component';
import { ConsumeComponent } from './single-machine/consume/consume.component';
import { SingleComponent } from './single-machine/single/single.component';
import { FixedDetailComponent } from './assets-info/fixed-assets/fixed-detail/fixed-detail.component';
const routes: Routes = [
{
path: "assets-info",
path: 'assets-info',
children: [
{ path: "anlage", component: AnlageComponent }, //附属设备及配件
{ path: "assets-cate", component: AssetsCateComponent }, //资产分类
{ path: "assets-nature", component: AssetsNatureComponent }, //资产性质
{ path: "cate-fixed-assets", component: CateFixedAssetsComponent }, //类固定资产台账
{ path: "custom", component: CustomComponent }, // 自定义字段
{ path: "depreciate", component: DepreciateComponent }, //一键折旧
{ path: "depreciation-record", component: DepreciationRecordComponent }, //资产折旧记录
{ path: "fixed-assets", component: FixedAssetsComponent }, //固定资产台账
{ path: "house", component: HouseComponent }, //房屋
{ path: "parts", component: PartsComponent }, //附件表
{ path: "plant-accident", component: PlantAccidentComponent }, //特种设备事故记录
{ path: "plant-operate", component: PlantOperateComponent }, //特种设备运行故障
{ path: "plant-verify", component: PlantVerifyComponent } //车辆/特种设备检定
]
{ path: 'anlage', component: AnlageComponent }, //附属设备及配件
{ path: 'assets-cate', component: AssetsCateComponent }, //资产分类
{ path: 'assets-nature', component: AssetsNatureComponent }, //资产性质
{ path: 'cate-fixed-assets', component: CateFixedAssetsComponent }, //类固定资产台账
{ path: 'custom', component: CustomComponent }, // 自定义字段
{ path: 'depreciate', component: DepreciateComponent }, //一键折旧
{ path: 'depreciation-record', component: DepreciationRecordComponent }, //资产折旧记录
{
path: 'fixed-assets',
component: FixedAssetsComponent,
}, //固定资产台账
{
path: 'fixed-assets/detail/:id',
component: FixedDetailComponent,
},
{ path: 'house', component: HouseComponent }, //房屋
{ path: 'parts', component: PartsComponent }, //附件表
{ path: 'plant-accident', component: PlantAccidentComponent }, //特种设备事故记录
{ path: 'plant-operate', component: PlantOperateComponent }, //特种设备运行故障
{ path: 'plant-verify', component: PlantVerifyComponent }, //车辆/特种设备检定
],
}, // 资产信息
{
path: "assets-insurance",
path: 'assets-insurance',
children: [
{ path: "danger", component: DangerComponent }, //出险登记
{ path: "insurance", component: InsuranceComponent } //保险登记
]
{ path: 'danger', component: DangerComponent }, //出险登记
{ path: 'insurance', component: InsuranceComponent }, //保险登记
],
}, // 资产保险
{
path: "assets-lease",
path: 'assets-lease',
children: [
{ path: "assess", component: AssessComponent }, //设备租入
{ path: "house", component: AssetsLeaseHouseComponent }, //房屋租凭
{ path: "rent", component: RentComponent }, //租入设备考核记录
{ path: "sub-contractor", component: SubContractorComponent } //分包商及租入特种设备管理
]
{ path: 'assess', component: AssessComponent }, //设备租入
{ path: 'house', component: AssetsLeaseHouseComponent }, //房屋租凭
{ path: 'rent', component: RentComponent }, //租入设备考核记录
{ path: 'sub-contractor', component: SubContractorComponent }, //分包商及租入特种设备管理
],
}, // 资产租凭
{
path: "assets-use",
path: 'assets-use',
children: [
{ path: "allot", component: AllotComponent }, //资产调拨
{ path: "apply", component: ApplyComponent }, //采购申请管理
{ path: "cancel-stock", component: CancelStockComponent }, //资产退库
{ path: "check", component: CheckComponent }, //验收记录
{ path: "contract", component: ContractComponent }, //采购合同管理
{ path: "dispatch", component: DispatchComponent }, //资产调遣
{ path: "lease", component: LeaseComponent }, //设备租出
{ path: "pay", component: PayComponent }, //采购支付管理
{ path: "personal-change", component: PersonalChangeComponent }, //资产人员变更
{ path: "property-change", component: PropertyChangeComponent }, //资产产权变更
{ path: "receive", component: ReceiveComponent }, //领用记录
{ path: "remembered", component: RememberedComponent }, //资产封存
{ path: "scrap", component: ScrapComponent }, //报废处置
{ path: "take-stock", component: TakeStockComponent }, //资产盘点计划
{ path: "use", component: UseComponent } //资产使用记录
]
{ path: 'allot', component: AllotComponent }, //资产调拨
{ path: 'apply', component: ApplyComponent }, //采购申请管理
{ path: 'cancel-stock', component: CancelStockComponent }, //资产退库
{ path: 'check', component: CheckComponent }, //验收记录
{ path: 'contract', component: ContractComponent }, //采购合同管理
{ path: 'dispatch', component: DispatchComponent }, //资产调遣
{ path: 'lease', component: LeaseComponent }, //设备租出
{ path: 'pay', component: PayComponent }, //采购支付管理
{ path: 'personal-change', component: PersonalChangeComponent }, //资产人员变更
{ path: 'property-change', component: PropertyChangeComponent }, //资产产权变更
{ path: 'receive', component: ReceiveComponent }, //领用记录
{ path: 'remembered', component: RememberedComponent }, //资产封存
{ path: 'scrap', component: ScrapComponent }, //报废处置
{ path: 'take-stock', component: TakeStockComponent }, //资产盘点计划
{ path: 'use', component: UseComponent }, //资产使用记录
],
}, // 资产使用
{
path: "canon",
children: [{ path: "vendor", component: VendorComponent }] //资产分类 //资产分类
path: 'canon',
children: [{ path: 'vendor', component: VendorComponent }], //资产分类 //资产分类
}, // 制造厂商
{
path: "device-maintain",
path: 'device-maintain',
children: [
{ path: "service-plan", component: ServicePlanComponent }, //维修保养计划
{ path: "service-record", component: ServiceRecordComponent } //维修保养记录
]
{ path: 'service-plan', component: ServicePlanComponent }, //维修保养计划
{ path: 'service-record', component: ServiceRecordComponent }, //维修保养记录
],
}, // 设备维保
{
path: "identity-manager",
path: 'identity-manager',
children: [
{ path: "device", component: DeviceComponent }, //设备证件
{ path: "staff", component: StaffComponent }, //员工证件表
{ path: "type", component: TypeComponent }, //证件类型
{ path: "user", component: UserComponent } //用户证件附件
]
{ path: 'device', component: DeviceComponent }, //设备证件
{ path: 'staff', component: StaffComponent }, //员工证件表
{ path: 'type', component: TypeComponent }, //证件类型
{ path: 'user', component: UserComponent }, //用户证件附件
],
}, // 证件管理
{
path: "matching-agitator",
children: [{ path: "", component: UseComponent }] //资产分类
path: 'matching-agitator',
children: [{ path: '', component: UseComponent }], //资产分类
}, // 搅拌站配比
{
path: "single-machine",
path: 'single-machine',
children: [
{ path: "business", component: BusinessComponent }, //机械设备燃料核算标准
{ path: "consume", component: ConsumeComponent }, //燃料消耗记录
{ path: "single", component: SingleComponent } //单机车核算
]
} // 单机车核算
{ path: 'business', component: BusinessComponent }, //机械设备燃料核算标准
{ path: 'consume', component: ConsumeComponent }, //燃料消耗记录
{ path: 'single', component: SingleComponent }, //单机车核算
],
}, // 单机车核算
];
@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule]
exports: [RouterModule],
})
export class FixedAssetsRoutingModule {}
......@@ -47,6 +47,7 @@ import { SharedModule } from '@shared';
import { AssetsCateComponent } from './assets-info/assets-cate/assets-cate.component';
import { AssetsLeaseHouseComponent } from './assets-lease/house/house.component';
import { BusinessComponent } from './single-machine/business/business.component';
import { FixedDetailComponent } from './assets-info/fixed-assets/fixed-detail/fixed-detail.component';
@NgModule({
declarations: [
......@@ -93,7 +94,8 @@ import { BusinessComponent } from './single-machine/business/business.component'
DeviceComponent,
UserComponent,
TypeComponent,
VendorComponent
VendorComponent,
FixedDetailComponent
],
imports: [SharedModule, FixedAssetsRoutingModule]
})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment