From f9c4126dde1f5a93ef742cc8f4e93d51863b6fe9 Mon Sep 17 00:00:00 2001 From: kuhan Date: Mon, 30 Jan 2023 19:04:50 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B1=B0=EB=9E=98=EC=B2=98=20=EC=84=A0?= =?UTF-8?q?=ED=83=9D=EC=8B=9C=20=EC=85=80=EB=A0=89=ED=8A=B8=20=EB=B0=95?= =?UTF-8?q?=EC=8A=A4=20=EC=82=AC=EB=9D=BC=EC=A7=80=EA=B2=8C=20=ED=95=98?= =?UTF-8?q?=EB=8A=90=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/res/front/js/biz/common/common.js | 18 ++++++++++--- .../static/res/front/js/biz/sell/add.js | 26 ++++++++++--------- .../res/front/js/lib/bootstrap-select.js | 2 +- 3 files changed, 30 insertions(+), 16 deletions(-) diff --git a/src/main/resources/static/res/front/js/biz/common/common.js b/src/main/resources/static/res/front/js/biz/common/common.js index 61db865..2868a4e 100644 --- a/src/main/resources/static/res/front/js/biz/common/common.js +++ b/src/main/resources/static/res/front/js/biz/common/common.js @@ -347,11 +347,23 @@ window.addEventListener('DOMContentLoaded', event => { // Toggle the side navigation const sidebarToggle = document.body.querySelector('#sidebarToggle'); if (sidebarToggle) { + //document.body.classList.toggle('sb-sidenav-toggled'); sidebarToggle.addEventListener('click', event => { event.preventDefault(); - document.body.classList.toggle('sb-sidenav-toggled'); - localStorage.setItem('sb|sidebar-toggle', document.body.classList.contains('sb-sidenav-toggled')); + var toggle = (localStorage.getItem('sb|sidebar-toggle') || '').trim(); + if(toggle == 'true'){ + localStorage.setItem('sb|sidebar-toggle', 'false'); + document.body.classList.remove('sb-sidenav-toggled'); + }else{ + localStorage.setItem('sb|sidebar-toggle', 'true'); + document.body.classList.add('sb-sidenav-toggled'); + } }); + var readToggle = (localStorage.getItem('sb|sidebar-toggle') || '').trim(); + if(readToggle == 'true'){ + document.body.classList.add('sb-sidenav-toggled'); + }else{ + document.body.classList.remove('sb-sidenav-toggled'); + } } - }); diff --git a/src/main/resources/static/res/front/js/biz/sell/add.js b/src/main/resources/static/res/front/js/biz/sell/add.js index f54445e..a7f240b 100644 --- a/src/main/resources/static/res/front/js/biz/sell/add.js +++ b/src/main/resources/static/res/front/js/biz/sell/add.js @@ -46,7 +46,6 @@ let appVue = new Vue({ }, mounted: function () { this.init(); -document.body.classList.toggle('sb-sidenav-toggled'); }, computed: {}, updated: function(){ @@ -129,10 +128,20 @@ document.body.classList.toggle('sb-sidenav-toggled'); alert('출고가를 입력하세요'); return false; } - if($this.disclosureSubsidy != '' || $this.disclosureSubsidy != 0 || $this.disclosureSubsidy != '0'){ + if($this.disclosureSubsidy != '' && $this.disclosureSubsidy != 0 && $this.disclosureSubsidy != '0'){ $this.disclosureSubsidyYn = true; } - + let index = $('#businessPartner').find(':selected').index(); + //시리얼 입력 여부 + if($this.info.businessPartnerList[index].serialYn){ + let confirmAction = confirm("시리얼 번호 필수인데 그냥 입력 하시겠습니까?"); + if (confirmAction) { + + }else{ + return false; + } + } + debugger; let parameter = { openingDate : $this.openingDate, birthday : $this.birthday, @@ -169,14 +178,14 @@ document.body.classList.toggle('sb-sidenav-toggled'); } console.log(parameter); - nscompany.mobile.api.sell.add(parameter, function (success, message, data) { + /*nscompany.mobile.api.sell.add(parameter, function (success, message, data) { if (!success) { alert(message); return false; } alert("저장 되었습니다."); location.reload(); - }); + });*/ }, openingDayBlur: function (){ let $this = this; @@ -292,13 +301,6 @@ document.body.classList.toggle('sb-sidenav-toggled'); })); $('#subRatePlan').selectpicker('refresh'); - //시리얼 입력 여부 - if($this.info.businessPartnerList[index].serialYn){ - $("#serialNumber").removeAttr('disabled'); - }else{ - $("#serialNumber").attr('disabled', 'disabled'); - } - }, formulaChange: function(e){ let $this = this; diff --git a/src/main/resources/static/res/front/js/lib/bootstrap-select.js b/src/main/resources/static/res/front/js/lib/bootstrap-select.js index 3c3f9bd..7e43d69 100644 --- a/src/main/resources/static/res/front/js/lib/bootstrap-select.js +++ b/src/main/resources/static/res/front/js/lib/bootstrap-select.js @@ -3349,7 +3349,7 @@ that.$menuInner.find('.active a').trigger('click', true); // retain active class $this.trigger('focus'); - +debugger; if (!that.options.liveSearch) { // Prevent screen from scrolling if the user hits the spacebar e.preventDefault();