Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-trungvq7-2207

components/common/modal/ChangeUserPswdPopPage.vue

@@ -1,6 +1,6 @@
 <template>
 	<v-row class="search-box" align="center" no-gutters>
-		<v-col v-if="item.label" :cols="item.cols == 12 ? 2 : 4">
+		<v-col v-if="item.label" :cols="item.labelCols !== undefined ? item.labelCols : item.cols == 12 ? 2 : 4">
 			<label for="" class="search-box-label">
 				<v-icon
 					x-small
@@ -28,10 +28,14 @@
 				></v-text-field>
 			</template>
 			<template v-else>
-				<v-btn :ripple="false" @click="dialog = !dialog">
-					<!-- <v-icon>mdi-content-save</v-icon> -->
+				<!-- <v-icon>mdi-content-save</v-icon> -->
+				<!-- <v-btn :ripple="false" @click="dialog = !dialog">
 					<span>비밀번호 {{ isPassword }}</span>
-				</v-btn>
+				</v-btn> -->
+				<a-button :ripple="false" @click="dialog = !dialog" class="ant-btn-outlined">
+					<!-- <v-icon>mdi-content-save</v-icon> -->
+					비밀번호 {{ isPassword }} 
+				</a-button>
 			</template>
 		</v-col>
 
@@ -48,7 +52,7 @@
 						</label>
 						<v-text-field
 							v-model.trim="firstPswd"
-							class="v-input__custom"
+							class="v-input-popup__custom"
 							type="password"
 							:readonly="!isFocused"
 							@focus="isFocused = true"
@@ -61,7 +65,7 @@
 						</label>
 						<v-text-field
 							v-model.trim="secondPswd"
-							class="v-input__custom"
+							class="v-input-popup__custom"
 							type="password"
 							:readonly="!isFocused"
 							@focus="isFocused = true"
@@ -72,8 +76,15 @@
 				<v-divider></v-divider>
 				<v-card-actions>
 					<v-spacer></v-spacer>
-					<v-btn color="primary" dark @click="setUpdate()">확인</v-btn>
-					<v-btn color="primary" dark @click="close()">닫기</v-btn>
+					<!-- <v-btn color="primary" dark @click="setUpdate()">확인</v-btn> -->
+					<div>
+						 <a-button @click="close()" class="btn-default">삭제</a-button>
+						 <a-button type="primary" @click="setUpdate()" class="v-btn-add-text">
+							 확인
+						 </a-button>
+					</div>
+					<!-- <v-btn color="primary" dark @click="close()">닫기</v-btn> -->
+
 				</v-card-actions>
 			</v-card>
 		</v-dialog>
@@ -135,8 +146,10 @@ export default {
 				} else {
 					return '';
 				}
+				console.log(value)
 			},
 			set(value) {
+				console.log(value)
 				return value;
 			},
 		},

components/common/modal/EvtObjPop.vue

@@ -124,7 +124,7 @@ export default {
 		return {
 			dialog: false,
 
-			loadGrid: true,
+			loadGrid: false,
 			grid_01: 'grid_01',
 			myModalKey: 'evtObjPop',
 			modalDataKey: 'modalData2',
@@ -165,35 +165,6 @@ export default {
 	computed: {
 		...mapState({
 			searchParam(state) {
-				const myOptions = {
-					columnOptions: {
-						resizable: true,
-					},
-					treeColumnOptions: {
-						name: 'readPlcNm', // Showing tree table
-						useIcon: false, // Not using icon
-						indentWidth: 10,
-					},
-				};
-				const dataPathMock = {
-					'grid_01': {
-						column: [
-						{ header: '검침개소명', name: 'readPlcNm', align: 'left', minWidth: 400, },
-						{ header: '검침개소', name: 'plcKind', minWidth: 100, align: 'center', },
-						// {
-						// 	header: '사용 여부', name: 'useFg', minWidth: 100, align: 'center',
-						// },
-					],
-						data: sampleData,
-						option: myOptions
-					}
-				};
-				return {
-					modalData2: {
-						evtObjPop: dataPathMock
-					}
-				}
-				// end test
 				return state.pageData[this.parentPrgmId];
 			},
 			myBindingData(state) {
@@ -277,6 +248,9 @@ export default {
 				columnOptions: {
 					resizable: true,
 				},
+				header: {
+					height: 38,
+				},
 			};
 			this.setModalGridOption({
 				modalKey: this.myModalKey,
@@ -300,7 +274,7 @@ export default {
 			});
 		},
 		async getGridData() {
-			// this.loadGrid = false;
+			this.loadGrid = false;
 
 			const res = await this.postApiReturn({
 				apiKey: 'selectTagBaseInfo',
@@ -376,7 +350,6 @@ export default {
 			//   this.dialog = false;
 			//   return;
 			// }
-			console.log("this.dialog: ", this.dialog);
 			this.dialog = !val;
 		},
 	},
@@ -389,50 +362,6 @@ var evtObjPop = {
 		option: {},
 	},
 };
-
-const sampleData = [
-  {
-    readPlcNm: '서울 본사',
-    plcKind: '본사',
-    useFg: '사용',
-    _children: [
-      {
-        readPlcNm: '서울 본사 - 1층',
-        plcKind: '층',
-        useFg: '사용',
-      },
-      {
-        readPlcNm: '서울 본사 - 2층',
-        plcKind: '층',
-        useFg: '미사용',
-      },
-    ],
-  },
-  {
-    readPlcNm: '부산 지사',
-    plcKind: '지사',
-    useFg: '사용',
-    _children: [
-      {
-        readPlcNm: '부산 지사 - A동',
-        plcKind: '건물',
-        useFg: '사용',
-        _children: [
-          {
-            readPlcNm: '부산 지사 - A동 1층',
-            plcKind: '층',
-            useFg: '사용',
-          },
-        ],
-      },
-    ],
-  },
-  {
-    readPlcNm: '대전 창고',
-    plcKind: '창고',
-    useFg: '미사용',
-  },
-];
 </script>
 
 <style lang="scss" scoped>