jianping li
2019-07-10 36251c876a856edbfeafb9f57e827d4494c9b7cd
修改调整记录的所属部门显示问题
4 files modified
12 ■■■■ changed files
frontdesk/src/app/routes/filearchives/arrangementlog/arrangementlog.component.html 2 ●●● patch | view | raw | blame | history
frontdesk/src/app/routes/filearchives/arrangementlog/arrangementlog.component.ts 4 ●●●● patch | view | raw | blame | history
frontdesk/src/app/shared/components/arrangementDetails/arrangementDetails.component.html 2 ●●● patch | view | raw | blame | history
frontdesk/src/app/shared/components/arrangementDetails/arrangementDetails.component.ts 4 ●●●● patch | view | raw | blame | history
frontdesk/src/app/routes/filearchives/arrangementlog/arrangementlog.component.html
@@ -90,7 +90,7 @@
          </div>
        </ng-container>
        <ng-container *ngIf="detailStep === 2">
          <app-ArrangementDetails [detailsPath]="detailJosnPath"></app-ArrangementDetails>
          <app-ArrangementDetails [detailsPath]="detailJosnPath" [operatorDepartment]="operatorDepartment"></app-ArrangementDetails>
        </ng-container>
      </div>
    </div>
frontdesk/src/app/routes/filearchives/arrangementlog/arrangementlog.component.ts
@@ -61,6 +61,7 @@
  iframeflg = false;
  detailJosnPath = '';
  operatorDepartment = '';
  detailStep = 2;
@@ -117,6 +118,8 @@
            case 6:
              element.arrangementStatusName = '等待实物调整确认';
            break;
            default:
              element.arrangementStatusName = '审批中';
          }
          return element;
        });
@@ -134,6 +137,7 @@
    // this.detailStep = 1;
    this.detailStep = 0;
    this.detailJosnPath = event.detailJosnPath;
    this.operatorDepartment = event.operatorDepartment;
    const processInstId = event.physicalProcessInstId ? event.physicalProcessInstId : event.processInstId;
    if (processInstId) {
      this.httpService.post('/applyforborrowing/getWorkflowData', {}, (res) => {
frontdesk/src/app/shared/components/arrangementDetails/arrangementDetails.component.html
@@ -17,7 +17,7 @@
        <tr>
          <td class="text-center">{{reason.arrangementId}}</td>
          <td class="text-center">{{reason.arrangementStaff}}</td>
          <td class="text-center">{{reason.orgValue}}</td>
          <td class="text-center">{{reason.OperatorDepartment}}</td>
          <td class="text-center"><span *ngIf="reason.materialObjectFlg">是</span><span *ngIf="!reason.materialObjectFlg">否</span></td>
          <td class="text-center">{{reason.reason == '' ? '无' : reason.reason}}</td>
        </tr>
frontdesk/src/app/shared/components/arrangementDetails/arrangementDetails.component.ts
@@ -15,6 +15,8 @@
  @Input()
  detailsPath = '';
  @Input()
  operatorDepartment = '';
  volumeBaseData = {
    VOLUME_CODE: '',
@@ -79,6 +81,8 @@
      // 解析册元数据 只显示已经修改的
      this.analysisVolumeDetail(json.oldVolumeDetail, json.newVolumeDetail);
      this.reason = json.reason;
      console.log(this.operatorDepartment);
      this.reason.operatorDepartment = this.operatorDepartment;
      this.swalUtil.close();
    });
  }