Commit @b19767f6dfdd90a92932f36968de6efee5840fb8

hmkim 04-11

Merge branch 'master' of http://210.180.118.83/jhpark/cms_frontend

@b19767f6dfdd90a92932f36968de6efee5840fb8

ff4698a

b19767f

client/resources/scss/common/component/_pagination.scss

--- client/resources/scss/common/component/_pagination.scss

+++ client/resources/scss/common/component/_pagination.scss


         border: 1px solid var(--tk-gray-30);
         border-radius: var(--tk-rd-10);
         margin: 0 .5rem;
+        cursor: pointer;
+        user-select: none;
 
         &.active{
             background-color: var(--tk-main-50);

ff4698a

b19767f

client/views/pages/adm/authority/menuAuthority/MenuAuthority.vue

--- client/views/pages/adm/authority/menuAuthority/MenuAuthority.vue

+++ client/views/pages/adm/authority/menuAuthority/MenuAuthority.vue


               });
               this.authorList = newData;
             }
+            this.fnViewDetail(newData[0].id); // 메뉴 최상단 권한 조회
           }
         }
       } catch (error) {

ff4698a

b19767f

client/views/pages/adm/departmentManagement/DepartmentManagement.vue

--- client/views/pages/adm/departmentManagement/DepartmentManagement.vue

+++ client/views/pages/adm/departmentManagement/DepartmentManagement.vue


         const res = await findAll();
         if (res.status == 200) {
           this.deptList = res.data.data.hierachyList; // 부서 목록
+          if(this.deptList.length > 0) {
+            this.fnViewDetail(this.deptList[0].id); // 부서 최상단 조회
+          }
           this.authList = res.data.data.authList; // 권한 목록
           this.newDept = res.data.data.newDept; // 부서 빈 객체
           this.newDept.useYn = "Y";

ff4698a

b19767f

client/views/pages/adm/main/Main.vue

--- client/views/pages/adm/main/Main.vue

+++ client/views/pages/adm/main/Main.vue


         if (response.data.data.popupMng.length > 0) {
           this.tbody = [];
           this.tbody = this.popupList.map((popup, idx) => ({
-            id: 5 - idx,
+            id: idx + (this.popupList.length - (2 * idx)),
             popupTtl: popup.popupTtl,
             useYn:
               popup.popupUseYn == "Y"

         if (response.data.data.bbsCnNew.length > 0) {
           this.tbody2 = [];
           this.tbody2 = this.bbsCnList.map((bbs, idx) => ({
-            id: 5 - idx,
+            id: idx + (this.bbsCnList.length - (2 * idx)),
             ttl:
               bbs.type == "faq"
                 ? this.fnFindBbsTitle(bbs)

ff4698a

b19767f

client/views/pages/adm/menuManagement/menuManagement/MenuManagement.vue

--- client/views/pages/adm/menuManagement/menuManagement/MenuManagement.vue

+++ client/views/pages/adm/menuManagement/menuManagement/MenuManagement.vue


         const res = await menuFindAll();
         if (res.status == 200) {
           this.menuList = res.data.data.hierachyList; // 메뉴 목록
+          if (this.menuList.length > 0) {
+            this.fnViewDetail(this.menuList[0].id); // 최상위 메뉴 조회
+          }
           this.codeList = res.data.data.codeList; // 메뉴 타입 목록
           this.newMenu = res.data.data.newMenu; // 메뉴 빈 객체
           this.newMenu.useYn = "Y";

ff4698a

b19767f

client/views/pages/adm/preferences/commonCodeManagement/CommonCodeManagement.vue

--- client/views/pages/adm/preferences/commonCodeManagement/CommonCodeManagement.vue

+++ client/views/pages/adm/preferences/commonCodeManagement/CommonCodeManagement.vue


         const res = await findAll();
         if (res.status == 200) {
           this.codeList = res.data.data.hierachyList;
+          if(this.codeList.length > 0) {
+            this.fnViewDetail(this.codeList[0].id);
+          }
           this.newCode = res.data.data.newCode;
           this.newCode.useYn = "Y";
         }

     },
     // 최상위 신규 객체 생성
     topAdd() {
+      if (this.selectedCd != null) {
+        if (!confirm("작성 중인 공통코드정보는 저장되지 않습니다.\n계속 하시겠습니까?")) {
+          return;
+        }
+      }
+      this.selectedCd = null; // 선택된 코드 초기화
       this.viewCode = JSON.parse(JSON.stringify(this.newCode));
       this.originCode = this.viewCode.cd;
       this.submitStts = true;
     },
     // 하위 신규 객체 생성
     subAdd() {
-      if (Object.keys(this.viewCode).length === 0) {
+      // if (Object.keys(this.viewCode).length === 0) {
+      if (this.selectedCd == null) {
         alert("상위 코드를 지정해주세요.");
         return;
+      } else {
+        if (!confirm("작성 중인 공통코드정보는 저장되지 않습니다.\n계속 하시겠습니까?")) {
+          return;
+        }
       }
       const upCd = this.viewCode.cd;
       const upCdNm = this.viewCode.cdNm;

     // axios: 목록 수정
     async fnListUpdate() {
       try {
+        if (!confirm("공통코드 목록을 저장하시겠습니까?\n 작성 중인 공통코드정보는 저장되지 않습니다.")) {
+          return;
+        }
         const res = await updateListProc(this.codeList);
         alert(res.data.message);
         if (res.status == 200) {
           this.findAll();
+          this.findByCd();
         }
       } catch (error) {
         alert(error.res.data.message);

Add a comment

Open 0
Closed 0

List

...	...	@@ -142,6 +142,7 @@
142	142	});
143	143	this.authorList = newData;
144	144	}
	145	+ this.fnViewDetail(newData[0].id); // 메뉴 최상단 권한 조회
145	146	}
146	147	}
147	148	} catch (error) {

...	...	@@ -245,6 +245,9 @@
245	245	const res = await findAll();
246	246	if (res.status == 200) {
247	247	this.deptList = res.data.data.hierachyList; // 부서 목록
	248	+ if(this.deptList.length > 0) {
	249	+ this.fnViewDetail(this.deptList[0].id); // 부서 최상단 조회
	250	+ }
248	251	this.authList = res.data.data.authList; // 권한 목록
249	252	this.newDept = res.data.data.newDept; // 부서 빈 객체
250	253	this.newDept.useYn = "Y";

...	...	@@ -154,7 +154,7 @@
154	154	if (response.data.data.popupMng.length > 0) {
155	155	this.tbody = [];
156	156	this.tbody = this.popupList.map((popup, idx) => ({
157		- id: 5 - idx,
	157	+ id: idx + (this.popupList.length - (2 * idx)),
158	158	popupTtl: popup.popupTtl,
159	159	useYn:
160	160	popup.popupUseYn == "Y"
...	...	@@ -172,7 +172,7 @@
172	172	if (response.data.data.bbsCnNew.length > 0) {
173	173	this.tbody2 = [];
174	174	this.tbody2 = this.bbsCnList.map((bbs, idx) => ({
175		- id: 5 - idx,
	175	+ id: idx + (this.bbsCnList.length - (2 * idx)),
176	176	ttl:
177	177	bbs.type == "faq"
178	178	? this.fnFindBbsTitle(bbs)

...	...	@@ -378,6 +378,9 @@
378	378	const res = await menuFindAll();
379	379	if (res.status == 200) {
380	380	this.menuList = res.data.data.hierachyList; // 메뉴 목록
	381	+ if (this.menuList.length > 0) {
	382	+ this.fnViewDetail(this.menuList[0].id); // 최상위 메뉴 조회
	383	+ }
381	384	this.codeList = res.data.data.codeList; // 메뉴 타입 목록
382	385	this.newMenu = res.data.data.newMenu; // 메뉴 빈 객체
383	386	this.newMenu.useYn = "Y";

...	...	@@ -136,6 +136,9 @@
136	136	const res = await findAll();
137	137	if (res.status == 200) {
138	138	this.codeList = res.data.data.hierachyList;
	139	+ if(this.codeList.length > 0) {
	140	+ this.fnViewDetail(this.codeList[0].id);
	141	+ }
139	142	this.newCode = res.data.data.newCode;
140	143	this.newCode.useYn = "Y";
141	144	}
...	...	@@ -206,15 +209,26 @@
206	209	},
207	210	// 최상위 신규 객체 생성
208	211	topAdd() {
	212	+ if (this.selectedCd != null) {
	213	+ if (!confirm("작성 중인 공통코드정보는 저장되지 않습니다.\n계속 하시겠습니까?")) {
	214	+ return;
	215	+ }
	216	+ }
	217	+ this.selectedCd = null; // 선택된 코드 초기화
209	218	this.viewCode = JSON.parse(JSON.stringify(this.newCode));
210	219	this.originCode = this.viewCode.cd;
211	220	this.submitStts = true;
212	221	},
213	222	// 하위 신규 객체 생성
214	223	subAdd() {
215		- if (Object.keys(this.viewCode).length === 0) {
	224	+ // if (Object.keys(this.viewCode).length === 0) {
	225	+ if (this.selectedCd == null) {
216	226	alert("상위 코드를 지정해주세요.");
217	227	return;
	228	+ } else {
	229	+ if (!confirm("작성 중인 공통코드정보는 저장되지 않습니다.\n계속 하시겠습니까?")) {
	230	+ return;
	231	+ }
218	232	}
219	233	const upCd = this.viewCode.cd;
220	234	const upCdNm = this.viewCode.cdNm;
...	...	@@ -253,10 +267,14 @@
253	267	// axios: 목록 수정
254	268	async fnListUpdate() {
255	269	try {
	270	+ if (!confirm("공통코드 목록을 저장하시겠습니까?\n 작성 중인 공통코드정보는 저장되지 않습니다.")) {
	271	+ return;
	272	+ }
256	273	const res = await updateListProc(this.codeList);
257	274	alert(res.data.message);
258	275	if (res.status == 200) {
259	276	this.findAll();
	277	+ this.findByCd();
260	278	}
261	279	} catch (error) {
262	280	alert(error.res.data.message);

...	...	@@ -8,6 +8,8 @@
8	8	border: 1px solid var(--tk-gray-30);
9	9	border-radius: var(--tk-rd-10);
10	10	margin: 0 .5rem;
	11	+ cursor: pointer;
	12	+ user-select: none;
11	13
12	14	&.active{
13	15	background-color: var(--tk-main-50);

Delete comment