Dev

PMS/ClientApp/src/app/pages/domsale/SNM100P/SNM100P.component.ts

@@ -129,9 +129,15 @@ export class SNM100PComponent implements OnInit {
         if (res.Table[0].STATUS == 'DONE') {
           this.params.CUSTOMER_CODE = this.Data.CUSTOMER_CODE
           this.params.CUSTOMER_NAME = this.Data.CUSTOMER_NAME
-          this.InitData();
+
           this.modal.info('Transaction complete: applied and saved.', this.viewref);
-          this.dialogMain.Close();
+          if (this.IsEdit == true) {
+            this.dialogEdit.Close();
+          } else {
+            this.dialogMain.Close();
+          }
+          this.IsEdit = false;
+          this.InitData();
           this.Search();
         }
         else {

PMS/ClientApp/src/app/pages/warehouse/SNSE157/SNSE157.component.ts

-import { Component, OnInit, ViewChild, ViewContainerRef } from '@angular/core';
+import { Component, OnInit, ViewContainerRef } from '@angular/core';
 import { HttpService } from 'src/app/core/http.service';
 import { ModalService } from '../../../core/modal.service';
 
@@ -23,8 +23,6 @@ export class SNSE157Component implements OnInit {
     private viewref: ViewContainerRef,
   ) { }
 
-  @ViewChild("dialogMain", { static: false }) dialogMain: any;
-
   ngOnInit() {
     this.GetData()
   }
@@ -64,16 +62,11 @@ export class SNSE157Component implements OnInit {
         if (res.Table[0].STATUS == 'DONE') {
           this.modal.info('Update successful.', this.viewref);
           this.GetData()
-          this.dialogMain.Close();
         }
         else {
           this.modal.warning(res.Table[0].MESSAGE, this.viewref);
         }
       })
   }
-
-  CancelAdd() {
-    this.dialogMain.Close();
-  }
 }