修复显示bug

jianping li

2019-07-10 988391baea56746d33886bcb27b5322222de6e9e

修复显示bug

 frontdesk/proxy.conf.json

@@ -1,16 +1,16 @@
{
    
    "/archive-web": {
        "target": "http://192.168.1.168:8090/",
        "target": "http://202.98.157.47:8090/",
        "secure": false
    },
    "/group1/M00": {
        "target": "http://192.168.1.166/",
        "target": "http://202.98.157.47:8083",
        "secure": false
    },

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


 frontdesk/src/app/routes/workflow/mydeal/mydeal.component.html

@@ -154,7 +154,7 @@
            </ng-container>

            <ng-container *ngIf="showdetailType === '5' || showdetailType === '6'" >
                <app-ArrangementDetails [detailsPath]="detailInfo.jsonpath"></app-ArrangementDetails>
                <app-ArrangementDetails [detailsPath]="detailInfo.jsonpath" [operatorDepartment]="operatorDepartment"></app-ArrangementDetails>
              <!-- <div class="panel-heading" style="margin-top: 5px;">
                <font color="" size="3">调整申请详情</font>
              </div>
@@ -189,7 +189,7 @@
            </app-table>
            </ng-container>
            <ng-container *ngIf="showdetailType === '7'" >
              <app-ArrangementDetails [detailsPath]="detailInfo.betail"></app-ArrangementDetails>
              <app-ArrangementDetails [detailsPath]="detailInfo.betail"  [operatorDepartment]="operatorDepartment"></app-ArrangementDetails>
            </ng-container>
                    </div>
                </div>

 frontdesk/src/app/routes/workflow/mydeal/mydeal.component.ts

@@ -187,6 +187,7 @@
    betail: {},
    volumeList: []
  };
  operatorDepartment;

  volCol =  [
    {'colId': 'volumeCode', 'colName': '档案册编号'},
@@ -519,6 +520,7 @@
    }, (res) => {
      if (res.opState && res.rspCode === 'e0000') {
        this.detailInfo = res.data;
        this.operatorDepartment = res.data.betail.operatorDepartment;
        detailModal.show();
      } else {
        swal('操作失败', '未找到有效数据', 'warning');

 frontdesk/src/app/routes/workflow/mylaunch/mylaunch.component.html

@@ -181,7 +181,7 @@
            </ng-container>
                    
            <ng-container *ngIf="showdetailType === '5'" >
                <app-ArrangementDetails [detailsPath]="detailInfo.jsonpath"></app-ArrangementDetails>
                <app-ArrangementDetails [detailsPath]="detailInfo.jsonpath"   [operatorDepartment]="operatorDepartment"></app-ArrangementDetails>
              <!-- <div class="panel-heading" style="margin-top: 5px;">
                <font color="" size="3">调整申请详情</font>
              </div>
@@ -216,7 +216,7 @@
              </app-table>
            </ng-container>
            <ng-container *ngIf="showdetailType === '7'" >
              <app-ArrangementDetails [detailsPath]="detailInfo.betail"></app-ArrangementDetails>
              <app-ArrangementDetails [detailsPath]="detailInfo.betail" [operatorDepartment]="operatorDepartment"></app-ArrangementDetails>
            </ng-container>
          </div>
                  </div>

 frontdesk/src/app/routes/workflow/mylaunch/mylaunch.component.ts

@@ -26,6 +26,7 @@
    betail: {},
    volumeList: []
  };
  operatorDepartment;

  workflowUrl: any;

@@ -159,6 +160,7 @@
    }, (res) => {
      if (res.opState && res.rspCode === 'e0000') {
        this.detailInfo = res.data;
        this.operatorDepartment = res.data.betail.operatorDepartment;
        detailModal.show();
      } else {
        swal('操作失败', '未找到有效数据', 'warning');

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

@@ -81,7 +81,9 @@
      // 解析册元数据 只显示已经修改的
      this.analysisVolumeDetail(json.oldVolumeDetail, json.newVolumeDetail);
      this.reason = json.reason;
      this.reason.operatorDepartment = this.operatorDepartment;
      if(this.operatorDepartment != ''){
        this.reason.operatorDepartment = this.operatorDepartment;
      }
      this.swalUtil.close();
    });
  }