diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
index 09aae0e..cb07fde 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
@@ -44,8 +44,8 @@
                  <button *ngIf="(master.lender_short_name != 'MWISE') || (master.lender_short_name == 'MWISE' && LenderRoleID != '25' && currentPDStatus==pdStatusCheck.COMPLETED ||currentVendorStatus=='QC COMPLETED'||currentVendorStatus=='COMPLETED') && roleAccessDetails.reports && master.pd_type_name" mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Download Excel" matTooltipPosition="above" (click)="downloadExcel(viewID)"><mat-icon>download</mat-icon></button>
                 </span>
                  <span *ngIf="is_agency_logged_in ==true">
-                 <button *ngIf="master.lender_short_name == 'MWISE' && (LenderRoleID == '28' || LenderRoleID == '30') && (currentVendorStatus=='COMPLETED'||currentVendorStatus=='QC COMPLETED') && roleAccessDetails.reports && master.pd_type_name" mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="PD Report" matTooltipPosition="above" (click)="smcCreditPDReport(viewID)"><mat-icon>ballot</mat-icon></button>
-                 <button *ngIf="master.lender_short_name == 'MWISE' && (LenderRoleID == '28' || LenderRoleID == '30') && (currentVendorStatus=='COMPLETED'||currentVendorStatus=='QC COMPLETED') && roleAccessDetails.reports && master.pd_type_name" mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Download Excel" matTooltipPosition="above" (click)="downloadExcel(viewID)"><mat-icon>download</mat-icon></button>
+                 <button *ngIf="master.lender_short_name == 'MWISE' && (LenderRoleID == '28' || LenderRoleID == '30') && (currentVendorStatus=='COMPLETED'||currentVendorStatus=='QC_COMPLETED') && roleAccessDetails.reports && master.pd_type_name" mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="PD Report" matTooltipPosition="above" (click)="smcCreditPDReport(viewID)"><mat-icon>ballot</mat-icon></button>
+                 <button *ngIf="master.lender_short_name == 'MWISE' && (LenderRoleID == '28' || LenderRoleID == '30') && (currentVendorStatus=='COMPLETED'||currentVendorStatus=='QC_COMPLETED') && roleAccessDetails.reports && master.pd_type_name" mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Download Excel" matTooltipPosition="above" (click)="downloadExcel(viewID)"><mat-icon>download</mat-icon></button>
                  </span>
                 <span><button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon"  type="button" matTooltip="Close" matTooltipPosition="above" (click)="loadPdListCompoent()"><mat-icon>close</mat-icon></button></span>
       </div>
@@ -221,7 +221,7 @@
                                   <div *ngIf="LenderRoleID != '30'; else prompt">
                                     <span *ngIf="master.lender_short_name == 'MWISE'  && LenderRoleID != '25' && userId == master.fk_pd_allocated_to"> <button *ngIf="roleAccessDetails.allocate && addresses.assigned_pd && master.pd_type_name && addresses.addtional_pd_data[0].pd_status ==  pdStatusCheck.ALLOCATED || currentPDStatus!=pdStatusCheck.CANCELLED && (userRoleID == '28' && (currentVendorStatus !=pdStatusCheck.COMPLETED || currentVendorStatus !=pdStatusCheck.QC_COMPLETED)) || (userRoleID == '29' && currentVendorStatus !=pdStatusCheck.QC_COMPLETED)" mat-raised-button mat-button-md  mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Reject .. " matTooltipPosition="above" (click)="rejectPD()"><mat-icon>settings_backup_restore</mat-icon></button></span>
                                     <span *ngIf="is_agency_logged_in == false && master.lender_short_name == 'MWISE'  && LenderRoleID == '27' || LenderRoleID == '25' && currentPDStatus == pdStatusCheck.BOUNCED "><button *ngIf="roleAccessDetails.allocate && addresses.assigned_pd && addresses.addtional_pd_data[0].pd_type_name && (currentPDStatus == pdStatusCheck.ALLOCATED_TO_FIA ||currentPDStatus == pdStatusCheck.TRIGGERED||currentPDStatus == pdStatusCheck.ALLOCATED|| (currentPDStatus == pdStatusCheck.ALLOCATED && userId == master.fk_pd_allocated_to)|| (currentPDStatus == pdStatusCheck.BOUNCED && userId == master.fk_pd_allocated_to) || currentPDStatus==pdStatusCheck.CANCELLED)  " mat-raised-button mat-button-md  mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Allocate" matTooltipPosition="above" (click)="selfAllocation(addresses.fk_state)"><mat-icon>verified_user</mat-icon></button></span>
-                                    <span *ngIf="LenderRoleID =='28'&&currentVendorStatus != 'QC COMPLETED' && master.lender_short_name == 'MWISE'"><button *ngIf="roleAccessDetails.allocate && addresses.assigned_pd && addresses.addtional_pd_data[0].pd_type_name && (currentPDStatus == pdStatusCheck.ALLOCATED_TO_FIA||currentVendorStatus == pdStatusCheck.INPROGRESS ||currentVendorStatus == pdStatusCheck.ALLOCATED|| (currentVendorStatus == pdStatusCheck.ALLOCATED && userId == master.fk_pd_allocated_to)|| (currentVendorStatus == pdStatusCheck.BOUNCED && userId == master.fk_pd_allocated_to) || currentPDStatus!=pdStatusCheck.CANCELLED)  " mat-raised-button mat-button-md  mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Allocate" matTooltipPosition="above" (click)="selfAllocation(addresses.fk_state)"><mat-icon>verified_user</mat-icon></button></span>
+                                    <span *ngIf="LenderRoleID =='28'&&currentVendorStatus != 'QC_COMPLETED' && master.lender_short_name == 'MWISE'"><button *ngIf="roleAccessDetails.allocate && addresses.assigned_pd && addresses.addtional_pd_data[0].pd_type_name && (currentPDStatus == pdStatusCheck.ALLOCATED_TO_FIA||currentVendorStatus == pdStatusCheck.INPROGRESS ||currentVendorStatus == pdStatusCheck.ALLOCATED|| (currentVendorStatus == pdStatusCheck.ALLOCATED && userId == master.fk_pd_allocated_to)|| (currentVendorStatus == pdStatusCheck.BOUNCED && userId == master.fk_pd_allocated_to) || currentPDStatus!=pdStatusCheck.CANCELLED)  " mat-raised-button mat-button-md  mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Allocate" matTooltipPosition="above" (click)="selfAllocation(addresses.fk_state)"><mat-icon>verified_user</mat-icon></button></span>
                                     <span *ngIf="master.lender_short_name == 'MWISE'  && (LenderRoleID == '26')"><button *ngIf="roleAccessDetails.allocate && addresses.assigned_pd && addresses.addtional_pd_data[0].pd_type_name && (currentPDStatus == pdStatusCheck.TRIGGERED || currentPDStatus==pdStatusCheck.CANCELLED || (currentPDStatus == pdStatusCheck.ALLOCATED && master.pd_allocated_to_role_id == '27'))  " mat-raised-button mat-button-md  mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Allocate to Self" matTooltipPosition="above" (click)="selfAllocation(addresses.fk_state)"><mat-icon>verified_user</mat-icon></button></span>
                                     <span *ngIf="master.lender_short_name == 'MWISE'  && (LenderRoleID == '26')"><button *ngIf="roleAccessDetails.allocate && addresses.assigned_pd && addresses.addtional_pd_data[0].pd_type_name && (currentPDStatus == pdStatusCheck.TRIGGERED || currentPDStatus == pdStatusCheck.ALLOCATED) || ( master.pd_allocated_to_role_id == '26')  " mat-raised-button mat-button-md  mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Allocate to Vendor" matTooltipPosition="above" (click)="Allocationtovendor(addresses.fk_state)"><mat-icon>assignment_ind</mat-icon></button></span>
                                     <span *ngIf="master.lender_short_name == 'MWISE'  && LenderRoleID != '25' && (LenderRoleID != '26' || userId == master.fk_pd_allocated_to)"><button *ngIf="addresses.assigned_pd && addresses.addtional_pd_data[0].pd_type_name && (currentPDStatus == pdStatusCheck.ALLOCATED || currentPDStatus == pdStatusCheck.INPROGRESS)" mat-raised-button mat-button-md  mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Send back to CPA" matTooltipPosition="above" (click)="allocateToCpa()"><mat-icon>swap_vert</mat-icon></button></span>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts
index fc28523..56c4d6f 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts
@@ -377,18 +377,23 @@ export class ViewPdComponent implements OnInit, OnDestroy {
  
     // console.log("status = ",status);
     // console.log("pdDetails",pdDetails,pdDetails.fk_pd_id,this.pdMasterData);
+    // console.log("i am @379 - pdDetails",pdDetails,pdDetails.fk_pd_id,this.pdMasterData);
     let pd_allocated_to = this.pdMasterData[0].pd_allocated_to;
+    let vendor_status = this.pdMasterData[0].vendor_status;
     localStorage.setItem('pdid',pdDetails.fk_pd_id)
     this.destroyType = 3;
     let doSelfAllocated = 0;/** this for flag **/
-    if(this.userId != pd_allocated_to && (status == this.pdStatusCheck.ALLOCATED || status == this.pdStatusCheck.ALLOCATED_TO_FIA) && (this.userRoleID == 27 || this.userRoleID == 28)){
+    /* if(this.userId != pd_allocated_to && (status == this.pdStatusCheck.ALLOCATED || status == this.pdStatusCheck.ALLOCATED_TO_FIA) && (this.userRoleID == 27 || this.userRoleID == 28)){ */
+      if(this.userId != pd_allocated_to && (status == this.pdStatusCheck.ALLOCATED) && (this.userRoleID == 27 || this.userRoleID == 28)){
       console.log(this.userId,pd_allocated_to);
       /* console.log("if for flag",status);
          doSelfAllocated = 1;*/
-      this.selfallocate(pdDetails.fk_pd_id);
+         if(status != this.pdStatusCheck.ALLOCATED_TO_FIA && this.userRoleID != 27){
+          this.selfallocate(pdDetails.fk_pd_id);}
       // new Promise( resolve => setTimeout(resolve, 300) );
     }
-    if (status == this.pdStatusCheck.ALLOCATED || status == this.pdStatusCheck.SCHEDULED || status == this.pdStatusCheck.TRIGGERED||status == this.pdStatusCheck.ALLOCATED_TO_FIA) {
+    /* if (status == this.pdStatusCheck.ALLOCATED || status == this.pdStatusCheck.SCHEDULED || status == this.pdStatusCheck.TRIGGERED||status == this.pdStatusCheck.ALLOCATED_TO_FIA) {*/
+      if (status == this.pdStatusCheck.ALLOCATED || status == this.pdStatusCheck.SCHEDULED || status == this.pdStatusCheck.TRIGGERED|| (status == this.pdStatusCheck.ALLOCATED_TO_FIA && vendor_status == this.pdStatusCheck.ALLOCATED && this.userRoleID == 28)) {
       const dialogRef = this.dialog.open(PdStatusChangeDialogueComponent, {
         data: { pdid: pdDetails.assigned_pd, pd_status: this.pdStatusCheck.INPROGRESS,random_string:this.pdMasterData[0].random_string },
         disableClose: true,
@@ -409,8 +414,8 @@ export class ViewPdComponent implements OnInit, OnDestroy {
   StatusUpdate(master)
   {
     
-    let status='QC COMPLETED';
-
+    //let status='QC COMPLETED';
+      let status='QC_COMPLETED';
      let update_status = { 
        "pd_id":master.pd_id,
        "random_string":master.random_string