电子订单表格调整

jianping li

2019-06-24 877345851a9f8bea3d6c42ec229a4b170029242e

电子订单表格调整

 frontdesk/proxy.conf.json

@@ -1,16 +1,16 @@
{

    

    "/archive-web": {

        "target": "http://192.168.1.121:8090/",

        "target": "http://192.168.1.114:8090/",

        "secure": false

    },

    "/group1/M00": {

        "target": "http://192.168.1.166/",

        "target": "http://192.168.1.114/",

        "secure": false

    },



    "/file": {

        "target": "http://192.168.1.121:8012/file/",

        "target": "http://192.168.1.114:8012/file/",

         "secure": false           

     }




 frontdesk/src/app/app.module.ts

@@ -6,6 +6,7 @@
import { TranslateHttpLoader } from '@ngx-translate/http-loader';
import { AppComponent } from './app.component';
import { HttpService } from './service/common/http.service';
import { ListSort } from './service/common/listSort.service';
import { CookieService } from './service/common/cookie.service';
import { CoreModule } from './core/core.module';
import { LayoutModule } from './layout/layout.module';
@@ -48,6 +49,7 @@
    providers: [
        {provide: LocationStrategy,useClass: HashLocationStrategy},
        HttpService,
        ListSort,
        CookieService,
        AddressService,
        OrgDataService

 frontdesk/src/app/shared/components/showArchiveParts/showArchiveParts.component.html

@@ -133,43 +133,100 @@
            </div>
          </div>
          <br>
          <div class="table-head">
            <ng-container *ngFor="let row of blockList">
                <div class="row">
                  <ng-container *ngFor="let col of row">
                    <div class="col-md-3 item">
                      <span>{{col.chineseName}}:</span>
                      <span>{{col.value}}</span>
                    </div>
                  </ng-container>
          <ng-container  *ngIf="interfaceType!=='005'">
            <div class="table-head">
              <ng-container *ngFor="let row of blockList">
                  <div class="row">
                    <ng-container *ngFor="let col of row">
                      <div class="col-md-3 item">
                        <span>{{col.chineseName}}:</span>
                        <span>{{col.value}}</span>
                      </div>
                    </ng-container>
                  </div>
              </ng-container>
            </div>
            <div class="table-responsive" style="border-top:1px solid #f1f1f1;border-bottom:1px solid #f1f1f1">
              <table class="table">
                <thead>
                  <tr>
                    <ng-container *ngFor="let colName of col">
                      <th  rowspan="2"   > {{colName}}</th>
                    </ng-container>
                  </tr>
                </thead>
                <tbody>
                  <tr *ngFor="let data of relationList">
                    <ng-container *ngFor="let keyName of colId">
                        <td  > {{data[keyName]}}</td>
                    </ng-container>
                  </tr>
                </tbody>
              </table>
            </div>
            <div class="row myfooter">
              <ng-container *ngFor="let low of lowBlockList">
                <div class="col-md-2 text-center">
                  {{low.chineseName}}:{{low.value}}
                </div>
            </ng-container>
          </div>
          <div class="table-responsive" style="border-top:1px solid #f1f1f1;border-bottom:1px solid #f1f1f1">
            <table class="table">
              <thead>
                <tr>
                  <ng-container *ngFor="let colName of col">
                    <th  rowspan="2"   > {{colName}}</th>
                  </ng-container>
                </tr>
              </thead>
              <tbody>
                <tr *ngFor="let data of relationList">
                  <ng-container *ngFor="let keyName of colId">
                      <td  > {{data[keyName]}}</td>
                  </ng-container>
                </tr>
              </tbody>
            </table>
          </div>
          <div class="row myfooter">
            <ng-container *ngFor="let low of lowBlockList">
              <div class="col-md-2 text-center">
                {{low.chineseName}}:{{low.value}}
              </ng-container>
            </div>
          </ng-container>
          <ng-container *ngIf="interfaceType==='005'">
            <ng-container *ngFor="let items of destX">
              <div class="table-head">
                <ng-container *ngFor="let row of blockList">
                    <div class="row">
                      <ng-container *ngFor="let col of row">
                        <div class="col-md-3 item">
                          <span>{{col.chineseName}}:</span>
                          <span *ngIf="col.chineseName!=='记账凭证编号' && col.chineseName!=='服务订单号' && col.chineseName!=='记账日期'" >{{col.value}}</span>
                          <span *ngIf="col.chineseName==='记账凭证编号'" >{{items.AccountVoucherNumber}}</span>
                          <span *ngIf="col.chineseName==='服务订单号'" >{{items?.ServiceNumber}}</span>
                          <span *ngIf="col.chineseName==='记账日期'" >{{items?.CREATE_DATE | date:'yyyy/M/d'}}</span>
                        </div>
                      </ng-container>
                    </div>
                </ng-container>
              </div>
              <div class="table-responsive" style="border-top:1px solid #f1f1f1;border-bottom:1px solid #f1f1f1">
                <table class="table">
                  <thead>
                    <tr>
                      <ng-container *ngFor="let colName of col">
                        <th  rowspan="2"   > {{colName}}</th>
                      </ng-container>
                    </tr>
                  </thead>
                  <tbody>
                    <tr *ngFor="let data of items.data">
                      <ng-container *ngFor="let keyName of colId">
                          <td  > {{data[keyName]}}</td>
                      </ng-container>
                    </tr>
                  </tbody>
                </table>
              </div>
              <div class="row myfooter">
                <ng-container *ngFor="let low of lowBlockList">
                  <div class="col-md-2 text-center">
                    <ng-container  *ngIf="low.chineseName==='财务主管'" >
                      {{low.chineseName}}:{{items?.FinanceDirector}}
                    </ng-container>
                    <ng-container  *ngIf="low.chineseName==='复核'" >
                      {{low.chineseName}}:{{items?.ToReview}}
                    </ng-container>
                    <ng-container  *ngIf="low.chineseName==='记账会计'" >
                      {{low.chineseName}}:{{items?.Accounting}}
                    </ng-container>
                    <ng-container  *ngIf="low.chineseName==='出纳'" >
                      {{low.chineseName}}:{{items?.Cashier}}
                    </ng-container>
                  </div>
                </ng-container>
              </div>
            </ng-container>
          </div>
          </ng-container>
        </div>
      </div>
  </div>

 frontdesk/src/app/shared/components/showArchiveParts/showArchiveParts.component.ts

@@ -1,5 +1,6 @@
import { Component, OnInit, Input, SimpleChanges, OnChanges, Output, EventEmitter } from '@angular/core';
import { HttpService } from '../../../service/common/http.service';
import { ListSort } from '../../../service/common/listSort.service';
import { TemplateUtil } from '../../util/templateUtil';
import { commonTools } from '../../modules/commonTools';
import { UrlUtil } from '../../util/urlUtil';
@@ -77,6 +78,7 @@
    colId = [];

    relationList = [];
    relationListX = [];

    voucherCol = config.voucherCol;

@@ -92,8 +94,9 @@
    deleteFileIds = [];

    addFileIds = [];
    destX: any = [];

    constructor(private templateUtil: TemplateUtil, private httpService: HttpService, private urlUtil: UrlUtil) {}
    constructor(private templateUtil: TemplateUtil, private httpService: HttpService, private urlUtil: UrlUtil,private listSort: ListSort) {}

    ngOnInit(): void {}

@@ -144,8 +147,6 @@
        this.archiveData = archiveData;
        this.getInterfaceType();
        this.detailList = this.getArchiveDetail(this.archiveData);


        if (this.interfaceType === '005') {
          const data = [];
          this.lowBlockList = [];
@@ -165,7 +166,15 @@
              }
            });
          });
          this.blockList = this.splitMateDate(4, data);
          if(this.lowBlockList.length === 0){
            this.lowBlockList.push(
              {chineseName:"财务主管"},
              {chineseName:"复核"},
              {chineseName:"记账会计"},
              {chineseName:"出纳"},
              );
          }
          this.blockList = this.splitMateDate(3, data);
        }

        this.headCol.forEach(key =>
@@ -348,10 +357,11 @@
    }

    getCol(dataList) {
      const  data = this.getArchiveDetail({
      const getDatalist = {
        'archiveCode': dataList[0].archiveCode,
        'templetSetId': dataList[0].templetSetId
      });
      };
      const  data = this.getArchiveDetail(getDatalist);
      this.col = [];
      this.colId = [];
      data.forEach(element => {
@@ -373,6 +383,7 @@
        'codes': dataList.map(element => element.archiveCode)
      }, (res) => {
        this.relationList = res.data.data;
        this.destX = this.listSort.groupingSort(res.data.data);
      });
    }