Merge pull request 'Add not hide grid when paging' (#89) from dev-nghiantt-fix-bugs into dev

Reviewed-on: #89

pages/ems/base/PastRsltDataReadPage.vue

@@ -144,17 +144,17 @@ export default {
 		chkIsFind(val) {
 			if (val) {
 				this.page = 1;
-				this.search();
+				this.search(false);
 			}
 		},
 		chkTagId(val) {
 			if (this.initFlag && val != null) {
-				this.search();
+				this.search(false);
 			}
 		},
 		chkTagNm() {
 			if (this.initFlag) {
-				this.search();
+				this.search(false);
 			}
 		},
 		chkReadPlcId() {
@@ -193,13 +193,13 @@ export default {
 			postApiReturn: 'modules/list/postApiReturn',
 			chkOpenTabList: 'chkOpenTabList',
 		}),
-		async search() {
+		async search(isPaging) {
 			// this.gridInit();
 			if (this.initFlag) {
 				if (this.pageData.tagId == '' || this.pageData.tagId == null) {
 					alert('TAG를 선택해 주세요');
 				} else {
-					this.getRowGridData();
+					this.getRowGridData(isPaging);
 				}
 			}
 			this.setPageData({
@@ -289,9 +289,10 @@ export default {
 
 			this.loadGrid = true;
 		},
-		async getRowGridData() {
-			this.loadGrid = false;
-
+		async getRowGridData(isPaging) {
+			if(!isPaging) {
+				this.loadGrid = false;
+			}
 			let res = [];
 			let res2 = [];
 			let yearQuarterData = [];
@@ -476,7 +477,7 @@ export default {
 			this.page = pageNum;
 			this.limit = limit;
 
-			this.search();
+			this.search(true);
 		},
 	},
 };

pages/ems/base/ReadResultCloseMngPage.vue

@@ -198,7 +198,7 @@ export default {
     chkIsFind(val) {
       if (val) {
 				this.page = 1;
-				this.search();
+				this.search(false);
 			}
     },
     chkBlocId() {
@@ -265,12 +265,13 @@ export default {
         value: myColumns,
       });
     },
-    async search() {
-      await this.getRowGridData();
+    async search(isPaging) {
+      await this.getRowGridData(isPaging);
     },
-    async getRowGridData() {
-      this.loadGrid = false;
-
+    async getRowGridData(isPaging) {
+      if(!isPaging) {
+        this.loadGrid = false;
+      }
       if (
         this.pageData.blocMstrList.length > 0 &&
         this.pageData.commCdList.length > 0 &&
@@ -356,7 +357,7 @@ export default {
 			this.page = pageNum;
 			this.limit = limit;
 
-			this.search();
+			this.search(true);
 		},
   },
 };

pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue

@@ -211,7 +211,7 @@ export default {
 			}
 		},
 		chkIsFind(val) {
-			if (val) this.search();
+			if (val) this.search(false);
 		},
 		fabId(val) { },
 		fabNm(val) { },
@@ -371,8 +371,8 @@ export default {
 			}
 			await this.gridInit();
 		},
-		async search() {
-			await this.getRowGridData();
+		async search(isPaging) {
+			await this.getRowGridData(isPaging);
 			this.setPageData({
 				isFind: false,
 			});
@@ -725,9 +725,10 @@ export default {
 
 			this.getRowGridData();
 		},
-		async getRowGridData() {
-			this.loadGrid = false;
-
+		async getRowGridData(isPaging) {
+			if(!isPaging) {
+				this.loadGrid = false;
+			}
 			var res = await this.postApiReturn({
 				apiKey: 'selectEnrgEffcEqpmDetlMntr',
 				resKey: 'eqpmDetlData',
@@ -806,7 +807,7 @@ export default {
 			this.page = pageNum;
 			this.limit = limit;
 
-			this.search();
+			this.search(true);
 		},
 	},
 };