多组织 基本档案页面

src/app/core/startup/startup.service.ts

@@ -43,7 +43,7 @@ export class StartupService {
 
       zip(
         // this.httpClient.get(`assets/tmp/i18n/${this.i18n.defaultLang}.json`),
-        this.httpClient.get('sys/ng-alain/getAppData')
+        this.httpClient.get('sys/ng-alain/getAppData?orgId='+sessionStorage.getItem('pkorg'))
         //this.httpClient.get('./assets/tmp/app-data.json')
       ).pipe(
         // 接收其他拦截器后产生的异常消息
@@ -149,6 +149,7 @@ export class StartupService {
         // });
         // console.error(res.menu)
         this.menuService.add(res.menu);
+        sessionStorage.setItem('pkorg',res.pkOrg)
         // 设置页面标题的后缀
         this.titleService.default = '';
         // this.titleService.suffix = "方达项目管理系统";

src/app/entity/basedata/base-archives-collection-line.ts

@@ -0,0 +1,9 @@
+import { Page } from '../page';
+/**
+ * 收付款条线档案
+ */
+export class BaseArchivesCollectionLine extends Page{
+    id?:string;// 收付款条线主键
+    code?:string;//收付款条线编码
+    name?:string;//收付款条线名称
+}

src/app/entity/basedata/base-archives-cost.ts

@@ -0,0 +1,9 @@
+import { Page } from '../page';
+/**
+ * 费用档案
+ */
+export class BaseArchivesCost extends Page{
+    id?:string;// 费用主键
+    code?:string;//费用编码
+    name?:string;//费用名称
+}

src/app/layout/default/header/header.component.html

@@ -69,13 +69,13 @@
     <li class="hidden-mobile">
       <nz-dropdown nzTrigger="click" nzPlacement="bottomRight">
         <div class="alain-default__nav-item" nz-dropdown>
-          <i class="anticon anticon-appstore"></i>
+          {{settings.user.pkOrgName}}
         </div>
         <div nz-menu style="width: 100%;">
           <ng-container *ngFor="let org of orgList">
             <div nz-menu-item>
               <!-- <header-fullscreen></header-fullscreen> -->
-              <a (click)="aa()">{{org.departName}}</a>
+              <a (click)="orgClick(org)">{{org.departName}}</a>
             </div>
           </ng-container>
           

src/app/layout/default/header/header.component.ts

@@ -1,6 +1,10 @@
-import { Component, ChangeDetectionStrategy } from '@angular/core';
-import { SettingsService } from '@delon/theme';
+import { Component, ChangeDetectionStrategy, Inject } from '@angular/core';
+import { SettingsService, _HttpClient } from '@delon/theme';
 import { DepartService } from 'app/services/depart.service';
+import { Router } from '@angular/router';
+import { ReuseTabService } from '@delon/abc';
+import { ITokenService, DA_SERVICE_TOKEN } from '@delon/auth';
+import { StartupService } from '@core';
 
 @Component({
   selector: 'layout-header',
@@ -10,35 +14,70 @@ import { DepartService } from 'app/services/depart.service';
 export class HeaderComponent {
   searchToggleStatus: boolean;
 
-  constructor(public settings: SettingsService,public departService:DepartService) {}
+  constructor(
+    public settings: SettingsService,
+    public departService: DepartService,
+    private router: Router,
+    public http: _HttpClient,
+    private reuseTabService: ReuseTabService,
+    @Inject(DA_SERVICE_TOKEN) private tokenService: ITokenService,
+    private startupSrv: StartupService,
+  ) {}
   ngOnInit(): void {
     this.getOrgList();
   }
   toggleCollapsedSidebar() {
-    
     this.settings.setLayout('collapsed', !this.settings.layout.collapsed);
-    
-    
   }
 
   searchToggleChange() {
-    
     this.searchToggleStatus = !this.searchToggleStatus;
   }
 
   /**
    * 查询全部公司
    */
-  orgList=[];
-  getOrgList(){
-    this.departService.getByType("1").then((response)=>{
-      if(response.success){
-        this.orgList=response.result;
+  orgList = [];
+  getOrgList() {
+    this.departService.getByType('1').then(response => {
+      if (response.success) {
+        this.orgList = response.result;
+        this.orgList.forEach(element => {
+          if(element.id==this.settings.user.pkOrg){
+            sessionStorage.setItem('pkorg',element.id)
+          }
+        });
       }
-    })
+    });
   }
 
-  aa(){
-    // alert(1);
+  /**
+   * 切换公司
+   */
+  departName = '';
+  orgClick(org) {
+    this.departName = org.departName;
+    sessionStorage.setItem('pkorg', org.id);
+    // window.location.reload();
+    // this.reuseTabService.clear();
+    // this.router.navigateByUrl('/dashboard/analysis');
+    // this.router.navigateByUrl("");
+    // this.startupSrv.load().then(() => {
+    //   /*
+    //   let url = this.tokenService.referrer!.url || '/dashboard/analysis';
+    //   if (url.includes('/passport')) url = '/';
+    //   this.router.navigateByUrl(url);
+    //   this.notification.remove();
+    //   this.notification.success("欢迎 "+res.result.userInfo.username,res.result.timeTag+"好！欢迎回来");*/
+      
+    //   this.router.navigateByUrl('/dashboard/analysis');
+    // });
+    //刷新页面
+    window.location.reload();
+    // 清空路由复用信息
+    this.reuseTabService.clear();
+    this.router.navigateByUrl('/dashboard/analysis');
+    this.router.navigateByUrl("")
+    
   }
 }

src/app/routes/basedata/base-archives-collection-line/add/add.component.html

@@ -0,0 +1,20 @@
+<form nz-form [formGroup]="validateForm" (ngSubmit)="submitForm()">
+  <nz-form-item>
+    <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="code">条线编码</nz-form-label>
+    <nz-form-control [nzSm]="14" [nzXs]="24" >
+      <input nz-input formControlName="code" id="code" [(ngModel)]="baseArchivesCollectionLine.code"/>
+      <nz-form-explain *ngIf="validateForm.get('code')?.dirty && validateForm.get('code')?.errors">
+        请输入条线编码
+      </nz-form-explain>
+    </nz-form-control>
+  </nz-form-item>
+  <nz-form-item>
+    <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="name">条线名称</nz-form-label>
+    <nz-form-control [nzSm]="14" [nzXs]="24" >
+      <input nz-input formControlName="name" id="name" [(ngModel)]="baseArchivesCollectionLine.name"/>
+      <nz-form-explain *ngIf="validateForm.get('name')?.dirty && validateForm.get('name')?.errors">
+        请输入条线名称
+      </nz-form-explain>
+    </nz-form-control>
+  </nz-form-item>
+</form>

src/app/routes/basedata/base-archives-collection-line/add/add.component.spec.ts

@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { BasedataBaseArchivesCollectionLineAddComponent } from './add.component';
+
+describe('BasedataBaseArchivesCollectionLineAddComponent', () => {
+  let component: BasedataBaseArchivesCollectionLineAddComponent;
+  let fixture: ComponentFixture<BasedataBaseArchivesCollectionLineAddComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ BasedataBaseArchivesCollectionLineAddComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(BasedataBaseArchivesCollectionLineAddComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/routes/basedata/base-archives-collection-line/add/add.component.ts

@@ -0,0 +1,53 @@
+import { Component, OnInit } from '@angular/core';
+import { NzModalRef, NzMessageService } from 'ng-zorro-antd';
+import { _HttpClient } from '@delon/theme';
+import { FormBuilder, Validators, FormGroup } from '@angular/forms';
+import { BaseArchivesCollectionLine } from 'app/entity/basedata/base-archives-collection-line';
+
+@Component({
+  selector: 'app-basedata-base-archives-collection-line-add',
+  templateUrl: './add.component.html',
+})
+export class BasedataBaseArchivesCollectionLineAddComponent implements OnInit {
+ 
+
+  constructor(
+    private modal: NzModalRef,
+    private fb: FormBuilder
+  ) { }
+
+  ngOnInit(): void {
+    //初始化表单
+    this.validateForm = this.fb.group({
+      code: [null, [Validators.required]],
+      name: [null, [Validators.required]]
+    });
+  }
+
+  validateForm!: FormGroup;
+  baseArchivesCollectionLine: BaseArchivesCollectionLine={}; //对象
+  id="";
+  /**
+   * 保存提交按钮
+   */
+  submitForm(): void {
+    for (const i in this.validateForm.controls) {
+      this.validateForm.controls[i].markAsDirty();
+      this.validateForm.controls[i].updateValueAndValidity();
+    }
+    let valid = this.validateForm.valid;
+    if(valid){
+      if(!this.id){
+        //新增
+        alert("新增")
+      }else{
+        //修改
+        alert("修改")
+      }
+    }
+  }
+
+  close() {
+    this.modal.destroy();
+  }
+}

src/app/routes/basedata/base-archives-collection-line/base-archives-collection-line.component.html

@@ -0,0 +1,63 @@
+<page-header [action]="phActionTpl">
+  <ng-template #phActionTpl>
+    <button (click)="add()" nz-button nzType="primary" acl
+      [acl-ability]="'base-archives-collection-line:add'">新建</button>
+  </ng-template>
+</page-header>
+<nz-card>
+  <!-- 查询条件 -->
+  <form nz-form>
+    <div nz-row [nzGutter]="{ xs: 8, sm: 16, md: 24, lg: 32 }">
+      <div nz-col [nzSpan]="8">
+        <nz-form-item>
+          <nz-form-label [nzSm]="6" [nzXs]="24">条线编码</nz-form-label>
+          <nz-form-control [nzSm]="14" [nzXs]="24">
+            <input nz-input name="code" [(ngModel)]="baseArchivesCollectionLine.code" />
+          </nz-form-control>
+        </nz-form-item>
+      </div>
+      <div nz-col [nzSpan]="8">
+        <nz-form-item>
+          <nz-form-label [nzSm]="6" [nzXs]="24">条线名称</nz-form-label>
+          <nz-form-control [nzSm]="14" [nzXs]="24">
+            <input nz-input name="name" [(ngModel)]="baseArchivesCollectionLine.name" />
+          </nz-form-control>
+        </nz-form-item>
+      </div>
+      <div nz-col [nzSpan]="8">
+        <nz-form-item>
+          <nz-form-label [nzSm]="2" [nzXs]="24" [nzNoColon]=true></nz-form-label>
+          <nz-form-control [nzSm]="14" [nzXs]="24">
+            <button nzType="primary" (click)="query()" nz-button><span>查询</span></button>
+          </nz-form-control>
+        </nz-form-item>
+      </div>
+    </div>
+  </form>
+  <!-- 表格 -->
+  <div nz-row [nzGutter]="{ xs: 8, sm: 16, md: 24, lg: 32 }">
+    <div nz-col [nzSpan]="24">
+      <nz-table nzSize="small" #basicTable [nzData]="listOfData" [nzFrontPagination]="false" [nzTotal]="page.total"
+        [nzPageIndex]="page.current" (nzPageIndexChange)="pageIndexChange($event)" [nzLoading]="isSpinning">
+        <thead>
+          <tr>
+            <th>条线编码</th>
+            <th>条线名称</th>
+            <th>操作</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let data of basicTable.data">
+            <td>{{ data.code }}</td>
+            <td>{{ data.name }}</td>
+            <td>
+              <a (click)="update(data)" acl [acl-ability]="'base-archives-collection-line:update'">修改</a>
+              <nz-divider nzType="vertical" acl [acl-ability]="'base-archives-collection-line:update'"></nz-divider>
+              <a (click)="delete(data.id)" acl [acl-ability]="'base-archives-collection-line:delete'">删除</a>
+            </td>
+          </tr>
+        </tbody>
+      </nz-table>
+    </div>
+  </div>
+</nz-card>

src/app/routes/basedata/base-archives-collection-line/base-archives-collection-line.component.spec.ts

@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { BasedataBaseArchivesCollectionLineComponent } from './base-archives-collection-line.component';
+
+describe('BasedataBaseArchivesCollectionLineComponent', () => {
+  let component: BasedataBaseArchivesCollectionLineComponent;
+  let fixture: ComponentFixture<BasedataBaseArchivesCollectionLineComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ BasedataBaseArchivesCollectionLineComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(BasedataBaseArchivesCollectionLineComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/routes/basedata/base-archives-collection-line/base-archives-collection-line.component.ts

@@ -0,0 +1,124 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { _HttpClient, ModalHelper } from '@delon/theme';
+import { STColumn, STComponent } from '@delon/abc';
+import { SFSchema } from '@delon/form';
+import { BaseArchivesCollectionLine } from 'app/entity/basedata/base-archives-collection-line';
+import { NzModalService } from 'ng-zorro-antd';
+import { BasedataBaseArchivesCollectionLineAddComponent } from './add/add.component';
+
+@Component({
+  selector: 'app-basedata-base-archives-collection-line',
+  templateUrl: './base-archives-collection-line.component.html',
+})
+export class BasedataBaseArchivesCollectionLineComponent implements OnInit {
+  
+
+  constructor(
+    private modalService:NzModalService
+  ) { }
+
+  ngOnInit() {
+    this.getList();
+   }
+
+
+  listOfData = [];
+  baseArchivesCollectionLine: BaseArchivesCollectionLine={}; //对象
+  page = {
+    total: 0,
+    current: 0,
+  }; //页码
+  isSpinning = false;
+
+  //按页码显示数据
+  pageIndexChange(event) {
+    this.baseArchivesCollectionLine.pageNo = event; //当前页码
+    this.getList();
+  }
+
+  /**
+   * 查询数据表
+   */
+  getList(){
+    // this.isSpinning=true;
+    this.listOfData=[{id:"1"}]
+  }
+
+  /**
+   * 查询按钮
+   */
+  query(){
+    this.baseArchivesCollectionLine.pageNo = 1;
+    this.getList();
+  }
+  
+  /**
+   * 新增按钮
+   */
+  add() {
+    const modalRef = this.modalService.create({
+      nzTitle: "新增",
+      nzContent: BasedataBaseArchivesCollectionLineAddComponent,
+      nzWidth: 600,
+      nzComponentParams:{
+        // id:item.key
+      },
+      nzFooter: [
+        {
+          label: "关闭",
+          type: "default",
+          onClick: addModel => {
+            addModel.close()
+          }
+        },
+        {
+          label: "确定",
+          type: "primary",
+          // loading:this.modelSaveLoading,
+          onClick: addModel => {
+            addModel.submitForm()
+          }
+        }
+      ]
+    })
+  }
+
+  /**
+   * 修改按钮
+   */
+  update(item){
+    const modalRef = this.modalService.create({
+      nzTitle: "修改",
+      nzContent: BasedataBaseArchivesCollectionLineAddComponent,
+      nzWidth: 600,
+      nzComponentParams:{
+        id:item.id
+      },
+      nzFooter: [
+        {
+          label: "关闭",
+          type: "default",
+          onClick: addModel => {
+            addModel.close()
+          }
+        },
+        {
+          label: "确定",
+          type: "primary",
+          // loading:this.modelSaveLoading,
+          onClick: addModel => {
+            addModel.submitForm()
+          }
+        }
+      ]
+    })
+  }
+
+  /**
+   * 删除按钮
+   */
+  delete(id){
+    alert("删除成功")
+  }
+
+}

src/app/routes/basedata/base-archives-cost/add/add.component.html

@@ -0,0 +1,20 @@
+<form nz-form [formGroup]="validateForm" (ngSubmit)="submitForm()">
+  <nz-form-item>
+    <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="code">费用编码</nz-form-label>
+    <nz-form-control [nzSm]="14" [nzXs]="24" >
+      <input placeholder="自动生成" nz-input formControlName="code" id="code" [(ngModel)]="baseArchivesCost.code"/>
+      <nz-form-explain *ngIf="validateForm.get('code')?.dirty && validateForm.get('code')?.errors">
+        请输入费用编码
+      </nz-form-explain>
+    </nz-form-control>
+  </nz-form-item>
+  <nz-form-item>
+    <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="name">费用名称</nz-form-label>
+    <nz-form-control [nzSm]="14" [nzXs]="24" >
+      <input nz-input formControlName="name" id="name" [(ngModel)]="baseArchivesCost.name"/>
+      <nz-form-explain *ngIf="validateForm.get('name')?.dirty && validateForm.get('name')?.errors">
+        请输入费用名称
+      </nz-form-explain>
+    </nz-form-control>
+  </nz-form-item>
+</form>

src/app/routes/basedata/base-archives-cost/add/add.component.spec.ts

@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { BasedataBaseArchivesCostAddComponent } from './add.component';
+
+describe('BasedataBaseArchivesCostAddComponent', () => {
+  let component: BasedataBaseArchivesCostAddComponent;
+  let fixture: ComponentFixture<BasedataBaseArchivesCostAddComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ BasedataBaseArchivesCostAddComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(BasedataBaseArchivesCostAddComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/routes/basedata/base-archives-cost/add/add.component.ts

@@ -0,0 +1,56 @@
+import { Component, OnInit } from '@angular/core';
+import { NzModalRef, NzMessageService } from 'ng-zorro-antd';
+import { _HttpClient } from '@delon/theme';
+import { FormBuilder, Validators, FormGroup } from '@angular/forms';
+import { BaseArchivesCollectionLine } from 'app/entity/basedata/base-archives-collection-line';
+import { BaseArchivesCost } from 'app/entity/basedata/base-archives-cost';
+
+@Component({
+  selector: 'app-basedata-base-archives-cost-add',
+  templateUrl: './add.component.html',
+})
+export class BasedataBaseArchivesCostAddComponent implements OnInit {
+  record: any = {};
+  i: any;
+
+  constructor(
+    private modal: NzModalRef,
+    private fb: FormBuilder
+  ) { }
+
+  ngOnInit(): void {
+    //初始化表单
+    this.validateForm = this.fb.group({
+      code: [{value:"",disabled:true}],
+      name: [null, [Validators.required]]
+    });
+  }
+
+  validateForm!: FormGroup;
+  baseArchivesCost: BaseArchivesCost={}; //对象
+  id="";
+
+  /**
+   * 保存提交按钮
+   */
+  submitForm(): void {
+    for (const i in this.validateForm.controls) {
+      this.validateForm.controls[i].markAsDirty();
+      this.validateForm.controls[i].updateValueAndValidity();
+    }
+    let valid = this.validateForm.valid;
+    if(valid){
+      if(!this.id){
+        //新增
+        alert("新增")
+      }else{
+        //修改
+        alert("修改")
+      }
+    }
+  }
+
+  close() {
+    this.modal.destroy();
+  }
+}

src/app/routes/basedata/base-archives-cost/base-archives-cost.component.html

@@ -0,0 +1,62 @@
+<page-header [action]="phActionTpl">
+  <ng-template #phActionTpl>
+    <button (click)="add()" nz-button nzType="primary" acl [acl-ability]="'base-archives-cost:update'">新建</button>
+  </ng-template>
+</page-header>
+<nz-card>
+   <!-- 查询条件 -->
+  <form nz-form>
+    <div nz-row [nzGutter]="{ xs: 8, sm: 16, md: 24, lg: 32 }">
+      <div nz-col [nzSpan]="8">
+        <nz-form-item>
+          <nz-form-label [nzSm]="6" [nzXs]="24">费用编码</nz-form-label>
+          <nz-form-control [nzSm]="14" [nzXs]="24">
+            <input nz-input name="code" [(ngModel)]="baseArchivesCost.code" />
+          </nz-form-control>
+        </nz-form-item>
+      </div>
+      <div nz-col [nzSpan]="8">
+        <nz-form-item>
+          <nz-form-label [nzSm]="6" [nzXs]="24">费用名称</nz-form-label>
+          <nz-form-control [nzSm]="14" [nzXs]="24">
+            <input nz-input name="name" [(ngModel)]="baseArchivesCost.name" />
+          </nz-form-control>
+        </nz-form-item>
+      </div>
+      <div nz-col [nzSpan]="8">
+        <nz-form-item>
+          <nz-form-label [nzSm]="2" [nzXs]="24" [nzNoColon]=true></nz-form-label>
+          <nz-form-control [nzSm]="14" [nzXs]="24">
+            <button nzType="primary" (click)="query()" nz-button><span>查询</span></button>
+          </nz-form-control>
+        </nz-form-item>
+      </div>
+    </div>
+  </form>
+  <!-- 表格 -->
+  <div nz-row [nzGutter]="{ xs: 8, sm: 16, md: 24, lg: 32 }">
+    <div nz-col [nzSpan]="24">
+      <nz-table nzSize="small" #basicTable [nzData]="listOfData" [nzFrontPagination]="false" [nzTotal]="page.total"
+        [nzPageIndex]="page.current" (nzPageIndexChange)="pageIndexChange($event)" [nzLoading]="isSpinning">
+        <thead>
+          <tr>
+            <th>费用编码</th>
+            <th>费用名称</th>
+            <th>操作</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let data of basicTable.data">
+            <td>{{ data.code }}</td>
+            <td>{{ data.name }}</td>
+            <td>
+              <a (click)="update(data)" acl [acl-ability]="'base-archives-cost:update'">修改</a>
+              <nz-divider nzType="vertical" acl [acl-ability]="'base-archives-cost:update'"></nz-divider>
+              <a (click)="delete(data.id)" acl [acl-ability]="'base-archives-cost:delete'">删除</a>
+            </td>
+          </tr>
+        </tbody>
+      </nz-table>
+    </div>
+  </div>
+</nz-card>

src/app/routes/basedata/base-archives-cost/base-archives-cost.component.spec.ts

@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { BasedataBaseArchivesCostComponent } from './base-archives-cost.component';
+
+describe('BasedataBaseArchivesCostComponent', () => {
+  let component: BasedataBaseArchivesCostComponent;
+  let fixture: ComponentFixture<BasedataBaseArchivesCostComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ BasedataBaseArchivesCostComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(BasedataBaseArchivesCostComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/routes/basedata/base-archives-cost/base-archives-cost.component.ts

@@ -0,0 +1,126 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { _HttpClient, ModalHelper } from '@delon/theme';
+import { STColumn, STComponent } from '@delon/abc';
+import { SFSchema } from '@delon/form';
+import { NzModalService } from 'ng-zorro-antd';
+import { BaseArchivesCost } from 'app/entity/basedata/base-archives-cost';
+import { BasedataBaseArchivesCostAddComponent } from './add/add.component';
+
+@Component({
+  selector: 'app-basedata-base-archives-cost',
+  templateUrl: './base-archives-cost.component.html',
+})
+export class BasedataBaseArchivesCostComponent implements OnInit {
+ 
+
+  constructor(
+    private modalService:NzModalService
+  ) { }
+
+  ngOnInit() {
+    this.getList();
+   }
+
+
+  listOfData = [];
+  baseArchivesCost: BaseArchivesCost={}; //对象
+  page = {
+    total: 0,
+    current: 0,
+  }; //页码
+  isSpinning = false;
+
+  //按页码显示数据
+  pageIndexChange(event) {
+    this.baseArchivesCost.pageNo = event; //当前页码
+    this.getList();
+  }
+
+  /**
+   * 查询数据表
+   */
+  getList(){
+    // this.isSpinning=true;
+    this.listOfData=[{id:"1"}]
+  }
+
+  /**
+   * 查询按钮
+   */
+  query(){
+    console.log(sessionStorage.getItem('pkorg'));
+    this.baseArchivesCost.pageNo = 1;
+    this.getList();
+  }
+  
+  /**
+   * 新增按钮
+   */
+  add() {
+    const modalRef = this.modalService.create({
+      nzTitle: "新增",
+      nzContent: BasedataBaseArchivesCostAddComponent,
+      nzWidth: 600,
+      nzComponentParams:{
+        // id:item.key
+      },
+      nzFooter: [
+        {
+          label: "关闭",
+          type: "default",
+          onClick: addModel => {
+            addModel.close()
+          }
+        },
+        {
+          label: "确定",
+          type: "primary",
+          // loading:this.modelSaveLoading,
+          onClick: addModel => {
+            addModel.submitForm()
+          }
+        }
+      ]
+    })
+  }
+
+  /**
+   * 修改按钮
+   */
+  update(item){
+    const modalRef = this.modalService.create({
+      nzTitle: "修改",
+      nzContent: BasedataBaseArchivesCostAddComponent,
+      nzWidth: 600,
+      nzComponentParams:{
+        id:item.id
+      },
+      nzFooter: [
+        {
+          label: "关闭",
+          type: "default",
+          onClick: addModel => {
+            addModel.close()
+          }
+        },
+        {
+          label: "确定",
+          type: "primary",
+          // loading:this.modelSaveLoading,
+          onClick: addModel => {
+            addModel.submitForm()
+          }
+        }
+      ]
+    })
+  }
+
+  /**
+   * 删除按钮
+   */
+  delete(id){
+    alert("删除成功")
+  }
+
+
+}

src/app/routes/basedata/base-archives-milestone/base-archives-milestone.component.html

@@ -1,6 +1,6 @@
 <page-header [action]="phActionTpl">
   <ng-template #phActionTpl>
-    <button (click)="add()" nz-button nzType="primary">新增一级</button>
+    <button (click)="add()" nz-button nzType="primary" acl [acl-ability]="'base-archives-milestone:add'">新增一级</button>
   </ng-template>
 </page-header>
 <nz-card>
@@ -54,11 +54,11 @@
                 <td>{{ item.name }}</td>
                 <td>{{ item.type }}</td>
                 <td>
-                  <a (click)="addChild(item)">新增子级</a>
-                  <nz-divider nzType="vertical"></nz-divider>
-                  <a (click)="update(item)">修改</a>
-                  <nz-divider nzType="vertical"></nz-divider>
-                  <a (click)="delete(item.id)">删除</a>
+                  <a (click)="addChild(item)" acl [acl-ability]="'base-archives-milestone:add'">新增子级</a>
+                  <nz-divider nzType="vertical" acl [acl-ability]="'base-archives-milestone:add'"></nz-divider>
+                  <a (click)="update(item)" acl [acl-ability]="'base-archives-milestone:update'">修改</a>
+                  <nz-divider nzType="vertical" acl [acl-ability]="'base-archives-milestone:update'"></nz-divider>
+                  <a (click)="delete(item.id)" acl [acl-ability]="'base-archives-milestone:delete'">删除</a>
                 </td>
               </tr>
             </ng-container>

src/app/routes/basedata/base-archives-milestone/base-archives-milestone.component.ts

@@ -183,7 +183,7 @@ export class BasedataBaseArchivesMilestoneComponent implements OnInit {
   /**
    * 删除按钮
    */
-  delete(item){
+  delete(id){
     alert("删除成功")
   }
 

src/app/routes/basedata/basedata-routing.module.ts

@@ -7,7 +7,9 @@ import { BasedataCustomerEditComponent } from './customer/edit/edit.component';
 import { BasedataCustomerDetailsComponent } from './customer/details/details.component';
 import { BasedataPostComponent } from './post/post.component';
 import { BasedataProjectApprovalComponent } from './project-approval/project-approval.component';
-import { BasedataBaseArchivesMilestoneComponent } from './base-archives-milestone/base-archives-milestone.component';
+import { BasedataBaseArchivesMilestoneComponent } from './base-archives-milestone/base-archives-milestone.component';
+import { BasedataBaseArchivesCollectionLineComponent } from './base-archives-collection-line/base-archives-collection-line.component';
+import { BasedataBaseArchivesCostComponent } from './base-archives-cost/base-archives-cost.component';
 
 const routes: Routes = [
   { path: 'customer', component: BasedataCustomerComponent },
@@ -16,7 +18,9 @@ const routes: Routes = [
   { path: 'details', component: BasedataCustomerDetailsComponent },
   { path: 'post', component: BasedataPostComponent },
   { path: 'project-approval', component: BasedataProjectApprovalComponent },
-  { path: 'base-archives-milestone', component: BasedataBaseArchivesMilestoneComponent }];
+  { path: 'base-archives-milestone', component: BasedataBaseArchivesMilestoneComponent },
+  { path: 'base-archives-collection-line', component: BasedataBaseArchivesCollectionLineComponent },
+  { path: 'base-archives-cost', component: BasedataBaseArchivesCostComponent }];
 @NgModule({
   imports: [RouterModule.forChild(routes)],
   exports: [RouterModule]

src/app/routes/basedata/basedata.module.ts

@@ -14,7 +14,11 @@ import { BasedataPostAddComponent } from './post/add/add.component';
 import { BasedataProjectApprovalComponent } from './project-approval/project-approval.component';
 import { BasedataProjectApprovalAddComponent } from './project-approval/add/add.component';
 import { BasedataBaseArchivesMilestoneComponent } from './base-archives-milestone/base-archives-milestone.component';
-import { BasedataBaseArchivesMilestoneAddComponent } from './base-archives-milestone/add/add.component';
+import { BasedataBaseArchivesMilestoneAddComponent } from './base-archives-milestone/add/add.component';
+import { BasedataBaseArchivesCollectionLineComponent } from './base-archives-collection-line/base-archives-collection-line.component';
+import { BasedataBaseArchivesCollectionLineAddComponent } from './base-archives-collection-line/add/add.component';
+import { BasedataBaseArchivesCostComponent } from './base-archives-cost/base-archives-cost.component';
+import { BasedataBaseArchivesCostAddComponent } from './base-archives-cost/add/add.component';
 
 const COMPONENTS = [
   BasedataCustomerComponent,
@@ -24,12 +28,16 @@ const COMPONENTS = [
   BasedataPostComponent
   ,
   BasedataProjectApprovalComponent,
-  BasedataBaseArchivesMilestoneComponent];
+  BasedataBaseArchivesMilestoneComponent,
+  BasedataBaseArchivesCollectionLineComponent,
+  BasedataBaseArchivesCostComponent];
 const COMPONENTS_NOROUNT = [BasedataCustomerEditComponent,
   BasedataCustomerIsAbbreviationComponent,
   BasedataPostAddComponent,
   BasedataProjectApprovalAddComponent,
-  BasedataBaseArchivesMilestoneAddComponent];
+  BasedataBaseArchivesMilestoneAddComponent,
+  BasedataBaseArchivesCollectionLineAddComponent,
+  BasedataBaseArchivesCostAddComponent];
 
 @NgModule({
   imports: [

src/app/routes/basedata/post/post.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit, ViewChild, TemplateRef } from '@angular/core';
-import { _HttpClient, ModalHelper } from '@delon/theme';
+import { _HttpClient, ModalHelper, SettingsService } from '@delon/theme';
 import { STColumn, STComponent } from '@delon/abc';
 import { SFSchema } from '@delon/form';
 import { NzTreeNode, NzFormatEmitEvent, NzDropdownService, NzDropdownContextComponent, NzModalService } from 'ng-zorro-antd';
@@ -19,7 +19,8 @@ export class BasedataPostComponent implements OnInit {
     private nzDropdownService: NzDropdownService,
     private modalService:NzModalService,
     private fb: FormBuilder,
-    private baseArchivesPostService:BaseArchivesPostService
+    private baseArchivesPostService:BaseArchivesPostService,
+    public settings: SettingsService
   ) { }
 
   ngOnInit() {

src/app/routes/basedata/project-approval/add/add.component.html

@@ -2,10 +2,10 @@
   <nz-form-item>
     <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="code">项目编码</nz-form-label>
     <nz-form-control [nzSm]="14" [nzXs]="24" >
-      <input nz-input formControlName="code" id="code" [(ngModel)]="baseArchivesProjectApproval.code"/>
-      <nz-form-explain *ngIf="validateForm.get('code')?.dirty && validateForm.get('code')?.errors">
+      <input placeholder="自动生成" nz-input formControlName="code" id="code" [(ngModel)]="baseArchivesProjectApproval.code"/>
+      <!-- <nz-form-explain *ngIf="validateForm.get('code')?.dirty && validateForm.get('code')?.errors">
         请输入项目编码
-      </nz-form-explain>
+      </nz-form-explain> -->
     </nz-form-control>
   </nz-form-item>
   <nz-form-item>

src/app/routes/basedata/project-approval/add/add.component.ts

@@ -18,7 +18,7 @@ export class BasedataProjectApprovalAddComponent implements OnInit {
   ngOnInit(): void {
     //初始化表单
     this.validateForm = this.fb.group({
-      code: [null, [Validators.required]],
+      code: [{value:"",disabled:true},[]],
       name: [null, [Validators.required]],
       status:[null]
 

src/app/routes/basedata/project-approval/project-approval.component.html

@@ -61,17 +61,15 @@
 
     <!--右边card-->
   <div nz-col nzMd="24" nzLg="12">
+    
     <nz-card>
       <!-- form -->
       <form nz-form [formGroup]="validateForm" (ngSubmit)="submitForm()">
         <nz-form-item>
           <nz-form-label nzRequired [nzSm]="8" [nzXs]="24">项目编码</nz-form-label>
-          <nz-form-control [nzSm]="14" [nzXs]="24">
+          <nz-form-control [nzSm]="14" [nzXs]="24" >
             <input formControlName="code" id="code" [(ngModel)]="baseArchivesProjectApproval.code" name="code" nz-input
-              placeholder="{{ 'placeholder' | translate }}项目编码" />
-              <nz-form-explain *ngIf="validateForm.get('code')?.dirty && validateForm.get('code')?.errors">
-                请输入项目编码
-              </nz-form-explain>
+              placeholder="自动生成" />
           </nz-form-control>
         </nz-form-item>
         <nz-form-item>
@@ -79,7 +77,7 @@
           <nz-form-control [nzSm]="14" [nzXs]="24">
             <input formControlName="name" id="name" [(ngModel)]="baseArchivesProjectApproval.name" name="name" nz-input
               placeholder="{{ 'placeholder' | translate }}项目名称" />
-              <nz-form-explain *ngIf="validateForm.get('code')?.dirty && validateForm.get('code')?.errors">
+              <nz-form-explain *ngIf="validateForm.get('name')?.dirty && validateForm.get('name')?.errors">
                 请输入项目名称
               </nz-form-explain>
           </nz-form-control>

src/app/routes/basedata/project-approval/project-approval.component.ts

@@ -22,7 +22,7 @@ export class BasedataProjectApprovalComponent implements OnInit {
   ngOnInit() {
     //初始化表单
     this.validateForm = this.fb.group({
-      code: [null, [Validators.required]],
+      code: [{value:"",disabled:true}],
       name: [null, [Validators.required]],
       status:[null]
     });

src/app/routes/passport/login/login.component.ts

@@ -132,6 +132,7 @@ export class UserLoginComponent implements OnDestroy {
         // 设置用户Token信息
         //this.tokenService.set(res.user);
         this.tokenService.set(res.result);
+        sessionStorage.setItem('pkorg', "");
         //console.log(res);
         // 重新获取 StartupService 内容，我们始终认为应用信息一般都会受当前用户授权范围而影响
         this.startupSrv.load().then(() => {

src/app/services/basedata/base-archives-collection-line.service.ts

@@ -0,0 +1,10 @@
+import { Injectable } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class BaseArchivesCollectionLineService {
+
+  constructor(private http:HttpClient) { }
+}

src/app/services/basedata/base-archives-cost.service.ts

@@ -0,0 +1,10 @@
+import { Injectable } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class BaseArchivesCostService {
+
+  constructor(private http:HttpClient) { }
+}