去掉ljp的全部修改

jianping li

2019-07-02 f55728fa722622c6eddb4cd473adebdeee58a24e

去掉ljp的全部修改

 frontdesk/package-lock.json

File was deleted

 frontdesk/proxy.conf.json

@@ -1,20 +1,20 @@
{

    
    "/archive-web": {

        "target": "http://192.168.1.119:8090/",

        "secure": false

    },

    "/group1/M00": {

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

        "secure": false

    },



    "/file": {

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

         "secure": false	       
     }



}



    


{
    
    "/archive-web": {
        "target": "http://192.168.1.168:8090/",
        "secure": false
    },
    "/group1/M00": {
        "target": "http://192.168.1.166/",
        "secure": false
    },

    "/file": {
        "target": "http://192.168.1.168:8012/file/",
         "secure": false	       
     }

}

    


 frontdesk/src/app/app.module.ts

@@ -6,8 +6,6 @@
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 { TemporaryCache } from './service/common/temporaryCache.service';
import { CookieService } from './service/common/cookie.service';
import { CoreModule } from './core/core.module';
import { LayoutModule } from './layout/layout.module';
@@ -50,8 +48,6 @@
    providers: [
        {provide: LocationStrategy,useClass: HashLocationStrategy},
        HttpService,
        ListSort,
        TemporaryCache,
        CookieService,
        AddressService,
        OrgDataService

 frontdesk/src/app/routes/filearchives/archives/archive.component.html

@@ -431,7 +431,7 @@


<div bsModal #smModal="bs-modal" class="modal fade in" tabindex="-1" role="dialog" aria-labelledby="mySmallModalLabel" aria-hidden="false" [config]="{backdrop: 'static',keyboard:false}">
    <div class="modal-dialog " style="width: 1000px;white-space:nowrap;">
    <div class="modal-dialog " style="width: 1000px;white-space:nowrap; ">
        <div class="modal-content">
            <div class="modal-body">
                <div class="row" style="margin-left: 10px;margin-right: 10px;">

 frontdesk/src/app/routes/filearchives/upvolume/upvolume.component.html

@@ -135,7 +135,7 @@
</div>

<div bsModal #archiveDetailModal="bs-modal" id="archiveDetailModal" class="modal fade in" tabindex="-1" role="dialog" aria-labelledby="mySmallModalLabel" aria-hidden="false" [config]="{backdrop: 'static',keyboard:false}">
  <div class="modal-dialog " style="width: 1000px;white-space:nowrap;top: 600px ">
  <div class="modal-dialog " style="width: 1000px;white-space:nowrap; ">
    <div class="modal-content">
      <em class="fa fa-times" style="margin-left:98%" (click)="archiveModalCloseById(archiveDetailModal,'archiveDetailModal')" aria-hidden="true"></em>
            <div class="modal-body">

 frontdesk/src/app/service/common/listSort.service.ts

File was deleted

 frontdesk/src/app/service/common/temporaryCache.service.ts

File was deleted

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

@@ -10,7 +10,6 @@
          <th class="text-center">申请人</th>
          <th class="text-center">申请人部门</th>
          <th class="text-center">调整实物</th>
          <th class="text-center">调整理由</th>
        </tr>
      </thead>
      <tbody style="height:auto; display:inline;">
@@ -19,6 +18,15 @@
          <td class="text-center">{{reason.arrangementStaff}}</td>
          <td class="text-center">{{reason.orgValue}}</td>
          <td class="text-center"><span *ngIf="reason.materialObjectFlg">是</span><span *ngIf="!reason.materialObjectFlg">否</span></td>
        </tr>
      </tbody>
      <thead class="text-center">
        <tr>
          <th class="text-center">调整理由</th>
        </tr>
      </thead>
      <tbody style="height:auto; display:inline;">
        <tr>
          <td class="text-center">{{reason.reason == '' ? '无' : reason.reason}}</td>
        </tr>
      </tbody>
@@ -66,18 +74,24 @@
        <thead class="text-center">
          <tr>
            <th class="text-center">说明</th>
            <th class="text-center">调整前</th>
            <th class="text-center">调整后</th>
            <ng-container *ngFor="let item of colList">
                <th class="text-center">{{item.colName}}</th>
            </ng-container>
          </tr>
        </thead>
        <tbody style="height:auto; display:inline;">
          <ng-container *ngFor="let item of colList">
            <tr *ngIf="volumeDetail.oldVolumeDetail[item.colId]!==undefined || volumeDetail.newVolumeDetail[item.colId]!==undefined">
              <td class="text-center">{{item.colName}}</td>
              <td class="text-center">{{volumeDetail.oldVolumeDetail[item.colId]}}</td>
              <td class="text-center">{{volumeDetail.newVolumeDetail[item.colId]}}</td>
            </tr>
          </ng-container>
          <tr>
            <td class="text-center">调整前</td>
            <ng-container *ngFor="let col of colList">
                <td class="text-center">{{volumeDetail.oldVolumeDetail[col.colId]}}</td>
            </ng-container>
          </tr>
          <tr>
            <td class="text-center">调整后</td>
              <ng-container *ngFor="let col of colList">
                  <td class="text-center">{{volumeDetail.newVolumeDetail[col.colId]}}</td>
              </ng-container>
          </tr>
        </tbody>
      </table>
    </div>

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

@@ -125,16 +125,10 @@
      const data = newVolumeDetail.find(newData => newData.metadataId === oldData.metadataId && newData.value !== oldData.value);
      if (data !== undefined) {
        this.colList.push({colName: data.chineseName, colId: data.englishName});
        var obj = {};
        this.colList = this.colList.reduce(function(item, next) {
          obj[next.colName] ? '' : obj[next.colName] = true && item.push(next)
          return item
        }, []);
        this.volumeDetail.newVolumeDetail[data.englishName] = data.value;
        this.volumeDetail.oldVolumeDetail[data.englishName] = oldData.value;
      }
    });
    console.log(this.volumeDetail);
  }

  analysisArchiveData(archive, key) {

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

@@ -133,100 +133,43 @@
            </div>
          </div>
          <br>
          <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>
          </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 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>
              <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>
                  </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>
          </ng-container>
          </div>
        </div>
      </div>
  </div>
@@ -237,7 +180,7 @@
      <ng-container *ngFor="let item of fileAdjustmentList">
        <div class="row">
          <ng-container *ngIf="item.dataType === '11' ">
            <uploadfile [tcData]="archiveData.archiveCode" [data]="item" [adjustmentFlg]="true" (addFile)="emitFileData($event,'add')" (deleteFile)="emitFileData($event,'delete')" ></uploadfile>
            <uploadfile [data]="item" [adjustmentFlg]="true" (addFile)="emitFileData($event,'add')" (deleteFile)="emitFileData($event,'delete')" ></uploadfile>
          </ng-container>
        </div>
        <div class="row">

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

@@ -1,11 +1,9 @@
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';
import { element } from 'protractor';
import { TemporaryCache } from '../../../service/common/temporaryCache.service';

const swal = require('sweetalert');
const config = require('../../../../assets/json/cloudVoucher.json');
@@ -79,7 +77,6 @@
    colId = [];

    relationList = [];
    relationListX = [];

    voucherCol = config.voucherCol;

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

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

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

    ngOnInit(): void {}

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


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

        this.headCol.forEach(key =>
@@ -220,6 +210,7 @@
      this.fileflg = false;
      this.fileList = [];
      this.httpService.post(this.httpService.selectArciveFile, {'fileCode': fileCode}, (res) => {
        console.log(res);
            if (res.data !== undefined && res.data.length !== 0 ) {
                this.fileflg = true;
                this.fileList = res.data;
@@ -273,9 +264,6 @@

    changeDetailStep(step): void {
        this.detailStep = step;
        if(step === 6){
          this.TemporaryCache.tcCall(this.archiveData);
        }
    }

    relationAchive(pageProperty): void {
@@ -360,11 +348,10 @@
    }

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


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

@@ -4,7 +4,6 @@
import { HttpService } from '../../../service/common/http.service';
import { UrlUtil } from '../../../shared/util/urlUtil';
import { Http } from '@angular/http';
import { TemporaryCache } from '../../../service/common/temporaryCache.service';

declare var $: any;
const swal = require('sweetalert');
@@ -47,7 +46,7 @@
    addFileList: [],
    value: ''
  };
  @Input()tcData;


  title = '文件上传';
  descript = '';
@@ -64,17 +63,7 @@
    private httpService: HttpService,
    private http: Http,
    private urlUtil: UrlUtil,
    private TemporaryCache: TemporaryCache,
    ) {
      this.TemporaryCache.tcStatas$.subscribe(
        () => {
          const tcValue = this.TemporaryCache.tcGet(this.tcData);
          if(this.uploader.files === [] && tcValue!= []){
            this.uploader.files = tcValue;
          }
        }
      );
    }
    ) {}

  ngOnInit() {
    this.uploader = new Resumable({
@@ -85,12 +74,6 @@
      throttleProgressCallbacks: 1,
      chunkSize: 1 * 1024 * 1024
    });
    if(this.TemporaryCache.tcGet(this.tcData)){
      const tcValue = this.TemporaryCache.tcGet(this.tcData);
      if(this.uploader.files){
        this.uploader.files = tcValue;
      }
    }
    this.data.addFileList = [];

  };
@@ -128,7 +111,7 @@
        swal('文件:' + file.fileName + '上传失败!', '请从新上传', 'info');
      };
      this.httpService.post('uploadservlet/getFastPath', {fileName: file.fileName}, (res) => {
        if (res.data === undefined) {
        if (res.data === undefined || res.data === '') {
          fun();
        } else {
          const data = {
@@ -139,8 +122,9 @@
          };
          this.data.addFileList.push(data);
          data['fileOrder'] = this.data.uploadedFileList.length + 1;
          console.log(this.data);
          this.addFile.emit(data);
          this.TemporaryCache.tcSave({key:this.tcData,value:this.uploader.files});
          
          swal('文件' + file.fileName + '上传完成', '', 'success');
        }
      });
@@ -319,6 +303,7 @@
  }

  preview(item) {
      console.log(item);
      const type = item.fileName.split('.');
      const fileType = type[type.length - 1];
      let size = 0;

 frontdesk/src/assets/json-local/backupLocationList.json

File was deleted

 frontdesk/src/assets/json-local/cloudVoucher.json

File was deleted

 frontdesk/src/assets/json-local/config.json

File was deleted

 frontdesk/src/assets/json-local/config_https.json

File was deleted

 frontdesk/src/assets/json-local/menu.json

File was deleted

 frontdesk/src/assets/json-local/oldMenu.json

File was deleted

 frontdesk/src/assets/json-real/backupLocationList.json

File was deleted

 frontdesk/src/assets/json-real/cloudVoucher.json

File was deleted

 frontdesk/src/assets/json-real/config.json

File was deleted

 frontdesk/src/assets/json-real/menu.json

File was deleted

 frontdesk/src/assets/json-real/oldMenu.json

File was deleted

 frontdesk/src/assets/json-test/backupLocationList.json

File was deleted

 frontdesk/src/assets/json-test/cloudVoucher.json

File was deleted

 frontdesk/src/assets/json-test/config.json

File was deleted

 frontdesk/src/assets/json-test/config_https.json

File was deleted

 frontdesk/src/assets/json-test/menu.json

File was deleted

 frontdesk/src/assets/json-test/oldMenu.json

File was deleted

 frontdesk/src/assets/json/cloudVoucher.json

@@ -21,7 +21,7 @@
    "clientName",
    "DistributionNumber",
    "Amount",
    "ProjectNumber",
    "AccountVoucherNumber",
    "abstract",
    "BusinessScopeCode",
    "costCenter",

 frontdesk/src/assets/json/config.json

@@ -3,7 +3,7 @@
    "logoutUrl":"https://passport.changhong.com/logout.do?view=yun&livemode=0&service=http://archiveda.chfcloud.com:8083/#/login",
    "imgUrl":"",
    "workflowUrl":"http://chworkflow.chfcloud.com/#/",
    "workAppId":"87",
    "workAppId":"25",
    "localUrl":"http://archiveda.chfcloud.com:8083/",
    "signupUrl":"https://passport.changhong.com/trs/registerByPhone.do?view=yun&livemode=0&service=http%3A%2F%2Farchiveda.chfcloud.com%3A8083%2F#%2Flogin%2F",
    "showFileUrl":"http://archiveda.chfcloud.com:8083/",

 frontdesk/src/assets/json/menu.json

@@ -60,6 +60,12 @@
                "children":null
            },
            {
                "display":"档案册调整",
                "type":512,
                "name":"/filearchives/upvolume",
                "children":null
            },
            {
                "display":"调整记录",
                "type":512,
                "name":"/filearchives/arrangementlog",
@@ -67,7 +73,6 @@
            }
        ]    
    },

    {
        "display": "档案移交",
        "type": 256,