From 7a5c20c02db990656492ea02821ff79c7ed90a61 Mon Sep 17 00:00:00 2001 From: TaehunPark Date: Wed, 12 Oct 2022 17:43:30 +0900 Subject: [PATCH] =?UTF-8?q?fix:=EC=99=B8=EC=82=AC=EC=9E=A5=EB=B9=84?= =?UTF-8?q?=ED=98=84=ED=99=A9=20->=20=EC=97=85=EB=AC=B4=EC=9A=A9=ED=9C=B4?= =?UTF-8?q?=EB=8C=80=EC=A0=84=ED=99=94=20=EC=9E=91=EC=97=85=EC=99=84?= =?UTF-8?q?=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dbnt/faisp/equip/EquipController.java | 72 +++++-- .../dbnt/faisp/equip/mapper/EquipMapper.java | 5 + .../com/dbnt/faisp/equip/model/CellPhone.java | 25 ++- .../equip/repository/CellPhoneRepository.java | 14 ++ .../faisp/equip/service/EquipService.java | 25 +++ src/main/java/com/dbnt/faisp/util/Utils.java | 106 +++++++++- .../resources/mybatisMapper/EquipMapper.xml | 51 +++++ .../resources/static/js/equip/cellPhone.js | 193 ++++++++++++++++-- src/main/resources/static/js/equip/equip.js | 26 ++- .../templates/equip/cellPhoneEditModal.html | 80 +++++--- .../templates/equip/cellPhoneList.html | 50 ++++- .../templates/equip/cellPhoneSelecBox.html | 7 + .../resources/templates/equip/equipList.html | 12 +- .../templates/equip/equipModifyModal.html | 3 +- 14 files changed, 585 insertions(+), 84 deletions(-) create mode 100644 src/main/java/com/dbnt/faisp/equip/repository/CellPhoneRepository.java create mode 100644 src/main/resources/templates/equip/cellPhoneSelecBox.html diff --git a/src/main/java/com/dbnt/faisp/equip/EquipController.java b/src/main/java/com/dbnt/faisp/equip/EquipController.java index 3616c3fa..fabb91c8 100644 --- a/src/main/java/com/dbnt/faisp/equip/EquipController.java +++ b/src/main/java/com/dbnt/faisp/equip/EquipController.java @@ -6,6 +6,7 @@ import com.dbnt.faisp.equip.model.CellPhone; import com.dbnt.faisp.equip.model.Equip; import com.dbnt.faisp.equip.model.EquipLog; import com.dbnt.faisp.equip.service.EquipService; +import com.dbnt.faisp.fipTarget.model.PartInfo; import com.dbnt.faisp.organMgt.service.OrganConfigService; import com.dbnt.faisp.userInfo.model.UserInfo; import com.dbnt.faisp.userInfo.service.UserInfoService; @@ -210,16 +211,31 @@ public class EquipController { } @GetMapping("/cellPhoneList") - public ModelAndView cellPhoneList(@AuthenticationPrincipal UserInfo loginUser,CellPhone cellPhone) { + public ModelAndView cellPhoneList(@AuthenticationPrincipal UserInfo loginUser,CellPhone cellPhone,HttpServletResponse response) { ModelAndView mav = new ModelAndView("equip/cellPhoneList"); - + cellPhone.setDownOrganCdList(loginUser.getDownOrganCdList()); + //엑셀다운 + if(cellPhone.getExcel() != null && cellPhone.getExcel().equals("Y")){ + String[] headers = { "phone_key", "sosok", "tel_no", "user_nm", "ext_mail", "webex_no", "katalk_id"}; + String[] headerNames = { "연번", "소속","전화번호", "사용자(관리자)", "등록 외부메일", "웹엑스 미팅번호", "카카오톡 ID"}; + String[] columnType = { "int", "String","String", "String", "String", "String", "String", "Stiring"}; + String sheetName = "업무용 휴대전화 현황"; + String excelFileName = "업무용 휴대전화 현황"; + List cellPhoneList= equipService.selectCellPhoneList(cellPhone); + + try { + Utils.cellPhoneListToExcel(cellPhoneList, response, headers, headerNames, columnType, sheetName, excelFileName); + } catch (IOException e) { + + } + return null; + } //메뉴권한 확인 String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/equip/cellPhoneList").get(0).getAccessAuth(); - mav.addObject("accessAuth", accessAuth); - cellPhone.setDownOrganCdList(loginUser.getDownOrganCdList()); + mav.addObject("accessAuth", accessAuth); cellPhone.setQueryInfo(); - - + mav.addObject("cellPhoneList", equipService.selectCellPhoneList(cellPhone)); + cellPhone.setContentCnt(equipService.selectCellPhoneListCnt(cellPhone)); cellPhone.setPaginationInfo(); mav.addObject("searchParams", cellPhone); @@ -227,22 +243,50 @@ public class EquipController { } @GetMapping("/cellPhoneEditModal") - public ModelAndView cellPhoneEditModal(@AuthenticationPrincipal UserInfo loginUser,CellPhone cellPhone,String ogCd) { + public ModelAndView cellPhoneEditModal(@AuthenticationPrincipal UserInfo loginUser,CellPhone cellPhone) { ModelAndView mav = new ModelAndView("equip/cellPhoneEditModal"); + if(cellPhone.getPhoneKey() != null) { + cellPhone = equipService.selectCellPhoneInfo(cellPhone.getPhoneKey()); + ParamMap param = new ParamMap(); + param.put("downOrganCdList", organConfigService.selectDownOrganListWhereUserOgCd(cellPhone.getMgtOrgan())); + mav.addObject("managerList", userInfoService.selectManagerList(param)); + } + + if (cellPhone.getPhoneKey() == null) { + cellPhone.setWrtOrgan(loginUser.getOgCd()); + cellPhone.setWrtPart(loginUser.getOfcCd()); + cellPhone.setWrtUserSeq(loginUser.getUserSeq()); + cellPhone.setWrtNm(loginUser.getUserNm()); + } //메뉴권한 확인 - String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/equip/equipStatus").get(0).getAccessAuth(); + String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/equip/cellPhoneList").get(0).getAccessAuth(); mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); mav.addObject("userOrgan", loginUser.getOgCd()); mav.addObject("accessAuth", accessAuth); - - //사용자 리스트 - ParamMap param = new ParamMap(); - param.put("downOrganCdList", organConfigService.selectDownOrganListWhereUserOgCd(ogCd)); - mav.addObject("managerList", userInfoService.selectManagerList(param)); - + mav.addObject("info", cellPhone); return mav; } + @GetMapping("/cellPhoneSelecBox") + public ModelAndView cellPhoneSelecBox(String ogCd) { + ModelAndView mav = new ModelAndView("equip/cellPhoneSelecBox"); + ParamMap param = new ParamMap(); + param.put("downOrganCdList", organConfigService.selectDownOrganListWhereUserOgCd(ogCd)); + mav.addObject("managerList", userInfoService.selectManagerList(param)); + return mav; + } + + @PostMapping("/saveCellPhone") + public Integer saveCellPhone (@AuthenticationPrincipal UserInfo loginUser,CellPhone cellPhone){ + cellPhone.setWrtDt(LocalDateTime.now()); + return equipService.saveCellPhone(cellPhone); + } + + @PostMapping("/deleteCellPhone") + public void deleteCellPhone(@RequestBody List cellPhone){ + equipService.deleteCellPhone(cellPhone); + + } diff --git a/src/main/java/com/dbnt/faisp/equip/mapper/EquipMapper.java b/src/main/java/com/dbnt/faisp/equip/mapper/EquipMapper.java index d11e0a36..40b89131 100644 --- a/src/main/java/com/dbnt/faisp/equip/mapper/EquipMapper.java +++ b/src/main/java/com/dbnt/faisp/equip/mapper/EquipMapper.java @@ -1,5 +1,6 @@ package com.dbnt.faisp.equip.mapper; +import com.dbnt.faisp.equip.model.CellPhone; import com.dbnt.faisp.equip.model.Equip; import com.dbnt.faisp.equip.model.EquipLog; import com.dbnt.faisp.util.ParamMap; @@ -29,6 +30,10 @@ public interface EquipMapper { String selectEquipFirstId(Equip equip); + List selectCellPhoneList(CellPhone cellPhone); + + Integer selectCellPhoneListCnt(CellPhone cellPhone); + } diff --git a/src/main/java/com/dbnt/faisp/equip/model/CellPhone.java b/src/main/java/com/dbnt/faisp/equip/model/CellPhone.java index 8e37e416..91718c9a 100644 --- a/src/main/java/com/dbnt/faisp/equip/model/CellPhone.java +++ b/src/main/java/com/dbnt/faisp/equip/model/CellPhone.java @@ -37,20 +37,39 @@ public class CellPhone extends BaseModel{ private Integer pUserSeq; @Column(name = "ext_mail") private String extMail; + @Column(name = "katalk_id") + private String katalkId; @Column(name = "webex_no") - private Integer webexNo; + private String webexNo; + @Column(name = "description") + private String description; @Column(name = "wrt_organ") private String wrtOrgan; @Column(name = "wrt_part") private String wrtPart; @Column(name = "wrt_user_seq") - private String wrtUserSeq; + private Integer wrtUserSeq; @Column(name = "wrt_nm") private String wrtNm; @Column(name = "wrt_dt") private LocalDateTime wrtDt; - + @Transient + private String userNm; + + @Transient + private String sosok; + + @Transient + private String excel; + +@Override +public String toString() { + return "CellPhone [phoneKey=" + phoneKey + ", mgtOrgan=" + mgtOrgan + ", telNo=" + telNo + ", pUserSeq=" + pUserSeq + + ", extMail=" + extMail + ", katalkId=" + katalkId + ", webexNo=" + webexNo + ", description=" + + description + ", wrtOrgan=" + wrtOrgan + ", wrtPart=" + wrtPart + ", wrtUserSeq=" + wrtUserSeq + + ", wrtNm=" + wrtNm + ", wrtDt=" + wrtDt + ", userNm=" + userNm + ", sosok=" + sosok + "]"; +} diff --git a/src/main/java/com/dbnt/faisp/equip/repository/CellPhoneRepository.java b/src/main/java/com/dbnt/faisp/equip/repository/CellPhoneRepository.java new file mode 100644 index 00000000..c7c7c6dc --- /dev/null +++ b/src/main/java/com/dbnt/faisp/equip/repository/CellPhoneRepository.java @@ -0,0 +1,14 @@ +package com.dbnt.faisp.equip.repository; + +import com.dbnt.faisp.equip.model.CellPhone; + +import org.springframework.data.jpa.repository.JpaRepository; + + + +public interface CellPhoneRepository extends JpaRepository { + + + + +} diff --git a/src/main/java/com/dbnt/faisp/equip/service/EquipService.java b/src/main/java/com/dbnt/faisp/equip/service/EquipService.java index cf229d68..b5883110 100644 --- a/src/main/java/com/dbnt/faisp/equip/service/EquipService.java +++ b/src/main/java/com/dbnt/faisp/equip/service/EquipService.java @@ -2,11 +2,13 @@ package com.dbnt.faisp.equip.service; import com.dbnt.faisp.equip.mapper.EquipMapper; +import com.dbnt.faisp.equip.model.CellPhone; import com.dbnt.faisp.equip.model.Equip; import com.dbnt.faisp.equip.model.Equip.EquipId; import com.dbnt.faisp.equip.model.EquipFile; import com.dbnt.faisp.equip.model.EquipFile.EquipFileId; import com.dbnt.faisp.equip.model.EquipLog; +import com.dbnt.faisp.equip.repository.CellPhoneRepository; import com.dbnt.faisp.equip.repository.EquipFileRepository; import com.dbnt.faisp.equip.repository.EquipLogRepository; import com.dbnt.faisp.equip.repository.EquipRepository; @@ -36,6 +38,7 @@ public class EquipService { private final EquipRepository equipRepository; private final EquipFileRepository equipFileRepository; private final EquipLogRepository equipLogRepository; + private final CellPhoneRepository cellPhoneRepository; private final EquipMapper equipMapper; @@ -292,6 +295,28 @@ public class EquipService { public String selectEquipFirstId(Equip equip) { return equipMapper.selectEquipFirstId(equip); } + + @Transactional + public Integer saveCellPhone(CellPhone cellPhone) { + return cellPhoneRepository.save(cellPhone).getPhoneKey(); + } + + public List selectCellPhoneList(CellPhone cellPhone) { + return equipMapper.selectCellPhoneList(cellPhone); + } + + public Integer selectCellPhoneListCnt(CellPhone cellPhone) { + return equipMapper.selectCellPhoneListCnt(cellPhone); + } + + public CellPhone selectCellPhoneInfo(Integer phoneKey) { + return cellPhoneRepository.findById(phoneKey).orElse(null); + } + + @Transactional + public void deleteCellPhone(List cellPhone) { + cellPhoneRepository.deleteAll(cellPhone); + } diff --git a/src/main/java/com/dbnt/faisp/util/Utils.java b/src/main/java/com/dbnt/faisp/util/Utils.java index 5d881c19..e18d231e 100644 --- a/src/main/java/com/dbnt/faisp/util/Utils.java +++ b/src/main/java/com/dbnt/faisp/util/Utils.java @@ -25,6 +25,7 @@ import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.xssf.usermodel.XSSFDataFormat; import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import com.dbnt.faisp.equip.model.CellPhone; import com.dbnt.faisp.fipTarget.model.PartInfo; import com.dbnt.faisp.fipTarget.model.PartWork; @@ -516,7 +517,7 @@ public class Utils { } public static void partWorkListToExcel(List partWorkList, HttpServletResponse response, String[] headers, - String[] headerNames, String[] headerNames2, String[] columnType, String sheetName, String excelFileName) throws IOException { + String[] headerNames, String[] headerNames2, String[] columnType, String sheetName, String excelFileName) throws IOException { if(Utils.isNotEmpty(partWorkList)) { // 메모리에 100개의 행을 유지합니다. 행의 수가 넘으면 디스크에 적습니다. XSSFWorkbook wb = new XSSFWorkbook(); @@ -645,6 +646,109 @@ public class Utils { } } + + public static void cellPhoneListToExcel(List cellPhoneList, HttpServletResponse response, + String[] headers, String[] headerNames, String[] columnType, String sheetName, String excelFileName) throws IOException { + if(Utils.isNotEmpty(cellPhoneList)) { + // 메모리에 100개의 행을 유지합니다. 행의 수가 넘으면 디스크에 적습니다. + XSSFWorkbook wb = new XSSFWorkbook(); + Sheet sheet = wb.createSheet(sheetName); + Row headerRow = sheet.createRow(0); + CellStyle cellStyle1 = wb.createCellStyle(); //쉼표들어간 숫자 양식 + CellStyle cellStyle2 = wb.createCellStyle(); //숫자양식 + CellStyle headerStyle = wb.createCellStyle(); //숫자양식 + CellStyle headerStyle2 = wb.createCellStyle(); + CellStyle headerStyle3 = wb.createCellStyle(); + + XSSFDataFormat format = wb.createDataFormat(); + cellStyle1.setAlignment(HorizontalAlignment.CENTER); + cellStyle2.setDataFormat(format.getFormat("#,##0")); + cellStyle2.setAlignment(HorizontalAlignment.CENTER); + headerStyle2.setBorderTop(BorderStyle.THIN); + headerStyle2.setBorderBottom(BorderStyle.THIN); + headerStyle2.setBorderLeft(BorderStyle.THIN); + headerStyle2.setBorderRight(BorderStyle.THIN); + headerStyle2.setAlignment(HorizontalAlignment.CENTER); + headerStyle2.setFillPattern(FillPatternType.SOLID_FOREGROUND); + headerStyle2.setFillForegroundColor((short)3); + headerStyle2.setFillForegroundColor(IndexedColors.LIME.getIndex()); + headerStyle.setAlignment(HorizontalAlignment.CENTER); + headerStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND); + headerStyle.setFillForegroundColor((short)3); + headerStyle.setFillForegroundColor(IndexedColors.LIME.getIndex()); + headerStyle3.setBorderTop(BorderStyle.THIN); + headerStyle3.setBorderBottom(BorderStyle.THIN); + headerStyle3.setBorderLeft(BorderStyle.THIN); + headerStyle3.setBorderRight(BorderStyle.THIN); + headerStyle3.setAlignment(HorizontalAlignment.CENTER); + headerStyle3.setFillPattern(FillPatternType.SOLID_FOREGROUND); + headerStyle3.setFillForegroundColor((short)3); + headerStyle3.setFillForegroundColor(IndexedColors.LIME.getIndex()); + //로우그리기 + for(int i=0; i"); + out.write(""); + out.write(""); + out.write(""); + out.write(""); + out.write(""); + + out.flush(); + out.close(); + } + + } diff --git a/src/main/resources/mybatisMapper/EquipMapper.xml b/src/main/resources/mybatisMapper/EquipMapper.xml index b751584b..a150fc0e 100644 --- a/src/main/resources/mybatisMapper/EquipMapper.xml +++ b/src/main/resources/mybatisMapper/EquipMapper.xml @@ -392,6 +392,57 @@ order by version_no asc limit 1 + + + + \ No newline at end of file diff --git a/src/main/resources/static/js/equip/cellPhone.js b/src/main/resources/static/js/equip/cellPhone.js index 7bd51b00..b970c839 100644 --- a/src/main/resources/static/js/equip/cellPhone.js +++ b/src/main/resources/static/js/equip/cellPhone.js @@ -1,16 +1,5 @@ -$(document).on('click', '#addEquip', function (){ - $.ajax({ - url: '/equip/cellPhoneEditModal', - type: 'GET', - dataType:"html", - success: function(html){ - $("#cellPhoneEditModalContent").empty().append(html); - $("#cellPhoneEditModal").modal('show'); - }, - error:function(){ - - } - }); +$(document).on('click', '#addCellPhone', function (){ + showModal(null); }) $(document).on('change', '#mgtOrgan', function (){ @@ -41,6 +30,184 @@ function changeManager(ogCd){ }); } +$(document).on('click', '#saveCellPhone', function (){ + if(Validation()){ + if(confirm("저장하시겠습니까?")){ + document.getElementById("mgtOrgan").disabled = false; + contentFade("in"); + const formData = new FormData($("#cellPhoneEditFm")[0]); + $.ajax({ + type : 'POST', + data : formData, + url : "/equip/saveCellPhone", + processData: false, + contentType: false, + success : function(result) { + alert("저장되었습니다."); + contentFade("out"); + location.reload(); + }, + error : function(xhr, status) { + alert("저장에 실패하였습니다.") + contentFade("out"); + } + }) + } + } +}) +$(document).on('click', '.cellPhoneTr', function (event){ + const target = event.target; + if(!(target.className === "cpChk" ||$(target).parents("td").length>0)){ + const phoneKey = (Number($(this).find(".phoneKey").val())); + showModal(phoneKey); + } +}); + +$(document).on('click', '.affairTr', function (event){ + const target = event.target; + if(!(target.className === "apprvTd" || $(target).parents(".apprvTd").length>0)){ + $(".trChkBox").prop("checked", false); + $(this).find(".trChkBox").prop("checked", true); + getAffairViewModal(Number($(this).find(".affairKey").val())); + } +}) + +function showModal(phoneKey){ + $.ajax({ + url: '/equip/cellPhoneEditModal', + data: {phoneKey: phoneKey}, + type: 'GET', + dataType:"html", + success: function(html){ + $("#cellPhoneEditModalContent").empty().append(html); + $("#cellPhoneEditModal").modal('show'); + if(phoneKey == null){ + changeManager($("#mgtOrgan").val()); + } + }, + error:function(){ + + } + }); +} + +$(document).on('click', '#updateCellPhone', function (){ + if(Validation()){ + if(confirm("수정하시겠습니까?")){ + document.getElementById("mgtOrgan").disabled = false; + contentFade("in"); + const formData = new FormData($("#cellPhoneEditFm")[0]); + $.ajax({ + type : 'POST', + data : formData, + url : "/equip/saveCellPhone", + processData: false, + contentType: false, + success : function(result) { + alert("수정되었습니다."); + contentFade("out"); + showModal(result); + }, + error : function(xhr, status) { + alert("수정에 실패하였습니다.") + contentFade("out"); + } + }) + } + } +}) + +$(document).ready( function() { + $('#chk-all').click( function() { + $('.cellPhoneCheckBox').prop('checked',this.checked); + }); +}); + +$(document).on('click', '#deleteCellPhone', function (){ + if(confirm("선택한 대상을 삭제처리 하시겠습니까?")){ + const checkArr = []; + $('input:checkbox[name=cpChk]:checked').each(function (idx, el){ + checkArr.push({}); + const target = $(el); + checkArr[idx].phoneKey = Number(target.parents('tr').find('.phoneKey').val()); + }) + deleteCellPhone(checkArr); + + } +}) + +$(document).on('click', '#deleteCellPhoneM', function (){ + if(confirm("선택한 대상을 삭제처리 하시겠습니까?")){ + const checkArr = []; + checkArr.push({}); + checkArr[0].phoneKey = Number( $('input[name=phoneKey]').val()); + deleteCellPhone(checkArr); + } +}) + +function deleteCellPhone(checkArr){ + $.ajax({ + type : 'POST', + url : "/equip/deleteCellPhone", + data : JSON.stringify(checkArr), + contentType: 'application/json', + beforeSend: function (xhr){ + xhr.setRequestHeader($("[name='_csrf_header']").val(), $("[name='_csrf']").val()); + }, + success : function() { + alert("삭제처리 되었습니다."); + location.reload(); + }, + error : function(xhr, status) { + alert("삭제처리에 실패하였습니다"); + } + }) +} + +$(document).on('click', '#goExcel', function (){ + if(confirm("엑셀로 다운로드 하시겠습니까?")){ + $('input[name=excel]').val('Y'); + $('#searchFm').submit(); + $('input[name=excel]').val(''); + }else{ + false; + } +}) + +function Validation(){ + let flag = true; + const emailRule = /^[0-9a-zA-Z]([-_.]?[0-9a-zA-Z])*@[0-9a-zA-Z]([-_.]?[0-9a-zA-Z])*.[a-zA-Z]{2,3}$/i; + const regExp = /^\d{2,3}-\d{3,4}-\d{4}$/; + if($('#mgtOrgan').val() == ""){ + alert("관리처를 선택해주세요."); + $('#mgtOrgan').focus(); + flag = false; + } + if($('#pUserSeq').val() == ""){ + alert("사용자를 선택해주세요."); + $('#pUserSeq').focus(); + flag = false; + } + if($('#telNo').val() != ""){ + if(!regExp.test($("input[id='telNo']").val())) { + alert("전화번호 형식이 맞지않습니다."); + $('#telNo').focus(); + flag = false; + } + } + if($('#extMail').val() != ""){ + if(!emailRule.test($("input[id='extMail']").val())) { + alert("이메일 형식이 맞지않습니다."); + $('#extMail').focus(); + flag = false; + } + } + return flag; +} + +$(document).on('click', '#btn-close', function (){ + location.reload(); +}) diff --git a/src/main/resources/static/js/equip/equip.js b/src/main/resources/static/js/equip/equip.js index 16711814..b54fb1b2 100644 --- a/src/main/resources/static/js/equip/equip.js +++ b/src/main/resources/static/js/equip/equip.js @@ -246,10 +246,24 @@ $(document).on('click', '#equDeleteBtn', function (){ $('input:checkbox[name=equChk]:checked').each(function (idx, el){ checkArr.push({}); const target = $(el); - checkArr[idx].equKey = Number(target.parents('tr').find('.equKey').val()); - }) - - $.ajax({ + checkArr[idx].equKey = Number(target.parents('tr').find('.equKey').val()); + }) + deleteEquip(checkArr); + + } +}) + +$(document).on('click', '#deleteEquip', function (){ + if(confirm("선택한 대상을 삭제처리 하시겠습니까?")){ + const checkArr = []; + checkArr.push({}); + checkArr[0].equKey = Number($('#mEquKey').val()); + deleteEquip(checkArr); + } +}) + +function deleteEquip(checkArr){ + $.ajax({ type : 'POST', url : "/equip/epuipDelete", data : JSON.stringify(checkArr), @@ -265,9 +279,7 @@ $(document).on('click', '#equDeleteBtn', function (){ alert("삭제처리에 실패하였습니다"); } }) - - } -}) +} $(document).ready( function() { $('#chk-all').click( function() { diff --git a/src/main/resources/templates/equip/cellPhoneEditModal.html b/src/main/resources/templates/equip/cellPhoneEditModal.html index f95432af..c841e517 100644 --- a/src/main/resources/templates/equip/cellPhoneEditModal.html +++ b/src/main/resources/templates/equip/cellPhoneEditModal.html @@ -2,13 +2,23 @@
- + + + + + +
-
+ + + + + +
@@ -16,66 +26,78 @@ - + + + + + +
-
- +
+
- + + + + +
- +
- +
- +
- +
- +
- +
- +
- +
- +
-
- - -
+
+ + + + + + + + + +
\ No newline at end of file diff --git a/src/main/resources/templates/equip/cellPhoneList.html b/src/main/resources/templates/equip/cellPhoneList.html index 0d493a57..38184366 100644 --- a/src/main/resources/templates/equip/cellPhoneList.html +++ b/src/main/resources/templates/equip/cellPhoneList.html @@ -13,7 +13,8 @@
-
+ +
@@ -33,6 +34,8 @@
+ +
@@ -52,18 +55,22 @@ - - - - - + + + + + + + + + + + + -
-
- -
+
+
+ + +
@@ -113,5 +124,24 @@
+ + \ No newline at end of file diff --git a/src/main/resources/templates/equip/cellPhoneSelecBox.html b/src/main/resources/templates/equip/cellPhoneSelecBox.html new file mode 100644 index 00000000..cb36fb68 --- /dev/null +++ b/src/main/resources/templates/equip/cellPhoneSelecBox.html @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/equip/equipList.html b/src/main/resources/templates/equip/equipList.html index 04acee87..2a48b745 100644 --- a/src/main/resources/templates/equip/equipList.html +++ b/src/main/resources/templates/equip/equipList.html @@ -72,12 +72,7 @@ - -
- - - -
+
+
+ + + +
diff --git a/src/main/resources/templates/equip/equipModifyModal.html b/src/main/resources/templates/equip/equipModifyModal.html index 5edf8fff..9177487f 100644 --- a/src/main/resources/templates/equip/equipModifyModal.html +++ b/src/main/resources/templates/equip/equipModifyModal.html @@ -9,7 +9,7 @@
- +
@@ -93,6 +93,7 @@
+
\ No newline at end of file