diff --git a/src/main/java/cokr/xit/fims/sprt/web/Sprt03Controller.java b/src/main/java/cokr/xit/fims/sprt/web/Sprt03Controller.java index 324280e3..128def31 100644 --- a/src/main/java/cokr/xit/fims/sprt/web/Sprt03Controller.java +++ b/src/main/java/cokr/xit/fims/sprt/web/Sprt03Controller.java @@ -49,7 +49,7 @@ public class Sprt03Controller extends ApplicationController { mav.setViewName("fims/sprt/sprt03020-main"); mav.addObject("openerPageName", openerPageName); - if(fileId != null && !fileId.equals("")) { + if(!ifEmpty(fileId, ()->"").equals("")) { mav.addObject("fileId", fileId); FileQuery fileQuery = new FileQuery(); diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03020-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03020-main.jsp index c263b6c7..5fe41df3 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03020-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03020-main.jsp @@ -76,65 +76,88 @@ diff --git a/src/main/webapp/WEB-INF/jsp/index.jsp b/src/main/webapp/WEB-INF/jsp/index.jsp index 10bfe837..944cc87e 100644 --- a/src/main/webapp/WEB-INF/jsp/index.jsp +++ b/src/main/webapp/WEB-INF/jsp/index.jsp @@ -94,7 +94,23 @@ var MY_INFO = {}; var PARAM_TASK = "${param.taskSeCd}"; - + async function getVhclInfo(sggCd, vhrno, levy_stdde){ + return new Promise((resolve, reject) => { + json.post({ + url: wctx.url("/payer/vehicle.do"), + data: { + sggCd : sggCd, + vhrno : vhrno, + levy_stdde : levy_stdde + }, + success: function(resp, textStatus, jqXHR) { + resolve(resp); + }, + error: function(jqXHR, textStatus, error) { + } + }); + }); + }; async function fnGetAllTask(){ return new Promise((resolve, reject) => { diff --git a/src/main/webapp/resources/js/fims/photo-main.js b/src/main/webapp/resources/js/fims/photo-main.js index fd32be18..fee01325 100644 --- a/src/main/webapp/resources/js/fims/photo-main.js +++ b/src/main/webapp/resources/js/fims/photo-main.js @@ -1,10 +1,13 @@ -function settingPhotoMain(pageName, crdnIdElementId){ +function settingPhotoMain(pageName, crdnIdElementId, carInfoFunc, carLinkFunc){ var $P = pageObject[pageName]; $P.existFileArr = []; $P.localUploadArr = []; + $P.carInfoFunc = carInfoFunc; + $P.carLinkFunc = carLinkFunc; + //드래그앤드롭 Sortable.create(document.getElementById("dragAndDrop--"+pageName), { onEnd : function(evt){ diff --git a/src/main/webapp/resources/lib/fims/biz/paintweb/layout.js b/src/main/webapp/resources/lib/fims/biz/paintweb/layout.js index e0588a19..c3c74144 100644 --- a/src/main/webapp/resources/lib/fims/biz/paintweb/layout.js +++ b/src/main/webapp/resources/lib/fims/biz/paintweb/layout.js @@ -79,9 +79,9 @@ let xhtml = `
  • -
    -
    - +
    +
    +
  •