Merge remote-tracking branch 'origin/master'

src/main/resources/static/js/dlvylc/dlvylc.js

@@ -39,6 +39,20 @@ const fn_save_dftDlvylcAt = function (msg, adbkInnb) {
         });
     }
 }
+
+/**********************************************
+ 리턴 formId 세팅
+ ***********************************************/
+let formIdSave;
+const fn_set_formId = function (formId) {
+    if (formId !== ''){
+        formIdSave = formId;
+    } else {
+        formId = formIdSave;
+    }
+
+    return formId;
+}
 /**********************************************
  배송지 관리 팝업  ()
  ***********************************************/
@@ -46,7 +60,9 @@ const fn_move_dlvylc_manage_pop = function (pageIndex,callback, formId = '') {
     if (callback == undefined) {
         callback = 'fn_set_dlvylc';
     }
+    formId = fn_set_formId(formId);
     console.log("배송지 관리 팝업 : ", formId);
+
     $.ajax({
         type: 'post',
         url: '/sopmal/mpage/mbr/selectDlvylcManagePopup',
@@ -77,7 +93,9 @@ const fn_move_dlvylc_manage_full = function (pageIndex, callback, formId = '') {
     if (callback == undefined) {
         callback = 'fn_set_dlvylc';
     }
+    formId = fn_set_formId(formId);
     console.log("모바일 배송지 팝업 formId : ", formId);
+
     $.ajax({
         type: 'post',
         url: '/sopmal/mpage/mbr/selectDlvylcManagePopup',

src/main/resources/static/js/mngr/js/crm/dlvylc/dlvylc_2.js

@@ -72,6 +72,20 @@ const fn_select_recentDlvylcList = function (pageIndex, ordering) {
         }
     });
 }
+
+/**********************************************
+ 리턴 formId 세팅
+ ***********************************************/
+let formIdSave;
+const fn_set_formId = function (formId) {
+    if (formId !== ''){
+        formIdSave = formId;
+    } else {
+        formId = formIdSave;
+    }
+
+    return formId;
+}
 /**********************************************
  배송지 관리 팝업  (처음 호출 할 때)
  ***********************************************/
@@ -82,6 +96,8 @@ const fn_move_dlvylc_manage_pop = function (pageIndex, mbrInnb, mbrDvCd, callbac
     if (callback == undefined) {
         callback = fn_set_dlvylc;
     }
+    formId = fn_set_formId(formId);
+
     $.ajax({
         type: 'post',
         url: '/crm/dlvylc/selectRpuseDlvylcListInqire',

src/main/resources/static/mngr/js/crm/dlvylc/dlvylc_2.js

@@ -72,6 +72,20 @@ const fn_select_recentDlvylcList = function (pageIndex, ordering) {
         }
     });
 }
+
+/**********************************************
+ 리턴 formId 세팅
+ ***********************************************/
+let formIdSave;
+const fn_set_formId = function (formId) {
+    if (formId !== ''){
+        formIdSave = formId;
+    } else {
+        formId = formIdSave;
+    }
+
+    return formId;
+}
 /**********************************************
  배송지 관리 팝업  (처음 호출 할 때)
  ***********************************************/
@@ -82,6 +96,8 @@ const fn_move_dlvylc_manage_pop = function (pageIndex, mbrInnb, mbrDvCd, callbac
     if (callback == undefined) {
         callback = fn_set_dlvylc;
     }
+    formId = fn_set_formId(formId);
+
     $.ajax({
         type: 'post',
         url: '/crm/dlvylc/selectRpuseDlvylcListInqire',